Skip to content

Commit 107cb53

Browse files
committed
8327701: Remove the xlc toolchain
Reviewed-by: jwaters, erikj
1 parent 07acc0b commit 107cb53

File tree

19 files changed

+61
-303
lines changed

19 files changed

+61
-303
lines changed

doc/building.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ <h1 class="title">Building the JDK</h1>
6868
<li><a href="#apple-xcode" id="toc-apple-xcode">Apple Xcode</a></li>
6969
<li><a href="#microsoft-visual-studio"
7070
id="toc-microsoft-visual-studio">Microsoft Visual Studio</a></li>
71-
<li><a href="#ibm-xl-cc" id="toc-ibm-xl-cc">IBM XL C/C++</a></li>
71+
<li><a href="#ibm-open-xl-cc" id="toc-ibm-open-xl-cc">IBM Open XL
72+
C/C++</a></li>
7273
</ul></li>
7374
<li><a href="#boot-jdk-requirements" id="toc-boot-jdk-requirements">Boot
7475
JDK Requirements</a>
@@ -673,11 +674,10 @@ <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
673674
version number accordingly. If you have not installed the
674675
<code>BuildTools</code>, but e.g. <code>Professional</code>, adjust the
675676
product ID accordingly.</p>
676-
<h3 id="ibm-xl-cc">IBM XL C/C++</h3>
677-
<p>Please consult the AIX section of the <a
678-
href="https://wiki.openjdk.org/display/Build/Supported+Build+Platforms">Supported
679-
Build Platforms</a> OpenJDK Build Wiki page for details about which
680-
versions of XLC are supported.</p>
677+
<h3 id="ibm-open-xl-cc">IBM Open XL C/C++</h3>
678+
<p>The minimum accepted version of Open XL is 17.1.1.4. This is in
679+
essence clang 15, and will be treated as such by the OpenJDK build
680+
system.</p>
681681
<h2 id="boot-jdk-requirements">Boot JDK Requirements</h2>
682682
<p>Paradoxically, building the JDK requires a pre-existing JDK. This is
683683
called the "boot JDK". The boot JDK does not, however, have to be a JDK

doc/building.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,10 @@ that the " characters are essential)
487487
accordingly. If you have not installed the `BuildTools`, but e.g.
488488
`Professional`, adjust the product ID accordingly.
489489

490-
### IBM XL C/C++
490+
### IBM Open XL C/C++
491491

492-
Please consult the AIX section of the [Supported Build Platforms](
493-
https://wiki.openjdk.org/display/Build/Supported+Build+Platforms) OpenJDK Build
494-
Wiki page for details about which versions of XLC are supported.
492+
The minimum accepted version of Open XL is 17.1.1.4. This is in essence clang
493+
15, and will be treated as such by the OpenJDK build system.
495494

496495
## Boot JDK Requirements
497496

make/autoconf/build-performance.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -359,9 +359,6 @@ AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS],
359359
if test "x$ICECC" != "x"; then
360360
AC_MSG_RESULT([no, does not work effectively with icecc])
361361
PRECOMPILED_HEADERS_AVAILABLE=false
362-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
363-
AC_MSG_RESULT([no, does not work with xlc])
364-
PRECOMPILED_HEADERS_AVAILABLE=false
365362
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
366363
# Check that the compiler actually supports precomp headers.
367364
echo "int alfa();" > conftest.h

make/autoconf/flags-cflags.m4

Lines changed: 9 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
7777
fi
7878
fi
7979
80-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
81-
SHARED_LIBRARY_FLAGS="-qmkshrobj -bM:SRE -bnoentry"
82-
SET_EXECUTABLE_ORIGIN=""
83-
SET_SHARED_LIBRARY_ORIGIN=''
84-
SET_SHARED_LIBRARY_NAME=''
85-
8680
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
8781
SHARED_LIBRARY_FLAGS="-dll"
8882
SET_EXECUTABLE_ORIGIN=''
@@ -152,8 +146,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
152146
153147
CFLAGS_DEBUG_SYMBOLS="-g ${GDWARF_FLAGS}"
154148
ASFLAGS_DEBUG_SYMBOLS="-g"
155-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
156-
CFLAGS_DEBUG_SYMBOLS="-g1"
157149
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
158150
CFLAGS_DEBUG_SYMBOLS="-Z7"
159151
fi
@@ -219,11 +211,7 @@ AC_DEFUN([DEBUG_PREFIX_MAP_GCC_INCLUDE_PATHS],
219211
AC_DEFUN([FLAGS_SETUP_WARNINGS],
220212
[
221213
# Set default value.
222-
if test "x$TOOLCHAIN_TYPE" != xxlc; then
223-
WARNINGS_AS_ERRORS_DEFAULT=true
224-
else
225-
WARNINGS_AS_ERRORS_DEFAULT=false
226-
fi
214+
WARNINGS_AS_ERRORS_DEFAULT=true
227215
228216
UTIL_ARG_ENABLE(NAME: warnings-as-errors, DEFAULT: $WARNINGS_AS_ERRORS_DEFAULT,
229217
RESULT: WARNINGS_AS_ERRORS,
@@ -273,15 +261,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
273261
274262
DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
275263
;;
276-
277-
xlc)
278-
DISABLE_WARNING_PREFIX="-Wno-"
279-
CFLAGS_WARNINGS_ARE_ERRORS="-qhalt=w"
280-
281-
# Possibly a better subset than "all" is "lan:trx:ret:zea:cmp:ret"
282-
WARNINGS_ENABLE_ALL="-qinfo=all -qformat=all"
283-
DISABLED_WARNINGS=""
284-
;;
285264
esac
286265
AC_SUBST(DISABLE_WARNING_PREFIX)
287266
AC_SUBST(BUILD_CC_DISABLE_WARNING_PREFIX)
@@ -363,15 +342,6 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
363342
C_O_FLAG_SIZE="-Os"
364343
C_O_FLAG_DEBUG="-O0"
365344
C_O_FLAG_NONE="-O0"
366-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
367-
C_O_FLAG_HIGHEST_JVM="-O3 -qhot=level=1 -qinline -qinlglue"
368-
C_O_FLAG_HIGHEST="-O3 -qhot=level=1 -qinline -qinlglue"
369-
C_O_FLAG_HI="-O3 -qinline -qinlglue"
370-
C_O_FLAG_NORM="-O2"
371-
C_O_FLAG_DEBUG="-qnoopt"
372-
# FIXME: Value below not verified.
373-
C_O_FLAG_DEBUG_JVM=""
374-
C_O_FLAG_NONE="-qnoopt"
375345
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
376346
C_O_FLAG_HIGHEST_JVM="-O2 -Oy-"
377347
C_O_FLAG_HIGHEST="-O2"
@@ -524,12 +494,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
524494
else
525495
DEBUG_CFLAGS_JDK="-DDEBUG"
526496
527-
if test "x$TOOLCHAIN_TYPE" = xxlc; then
528-
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
529-
# Hotspot now overflows its 64K TOC (currently only for debug),
530-
# so for debug we build with '-qpic=large -bbigtoc'.
531-
DEBUG_CFLAGS_JVM="-qpic=large"
532-
fi
533497
if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
534498
DEBUG_CFLAGS_JVM="-fpic -mcmodel=large"
535499
fi
@@ -546,9 +510,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
546510
ALWAYS_DEFINES_JVM="-D_GNU_SOURCE -D_REENTRANT"
547511
elif test "x$TOOLCHAIN_TYPE" = xclang; then
548512
ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
549-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
550-
ALWAYS_DEFINES_JVM="-D_REENTRANT"
551-
ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -DSTDC"
552513
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
553514
# Access APIs for Windows 8 and above
554515
# see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
@@ -612,12 +573,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
612573
TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX
613574
fi
614575
615-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
616-
# Suggested additions: -qsrcmsg to get improved error reporting
617-
# set -qtbtable=full for a better traceback table/better stacks in hs_err when xlc16 is used
618-
TOOLCHAIN_CFLAGS_JDK="-qtbtable=full -qchars=signed -qfullpath -qsaveopt -qstackprotect" # add on both CFLAGS
619-
TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced -fno-exceptions \
620-
-qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
621576
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
622577
# The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
623578
# compilation of all source files regardless of the active code page on Windows.
@@ -626,20 +581,20 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
626581
fi
627582
628583
# CFLAGS C language level for JDK sources (hotspot only uses C++)
629-
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xxlc; then
584+
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
630585
LANGSTD_CFLAGS="-std=c11"
631586
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
632587
LANGSTD_CFLAGS="-std:c11"
633588
fi
634589
TOOLCHAIN_CFLAGS_JDK_CONLY="$LANGSTD_CFLAGS $TOOLCHAIN_CFLAGS_JDK_CONLY"
635590
636591
# CXXFLAGS C++ language level for all of JDK, including Hotspot.
637-
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xxlc; then
592+
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
638593
LANGSTD_CXXFLAGS="-std=c++14"
639594
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
640595
LANGSTD_CXXFLAGS="-std:c++14"
641596
else
642-
AC_MSG_ERROR([Don't know how to enable C++14 for this toolchain])
597+
AC_MSG_ERROR([Cannot enable C++14 for this toolchain])
643598
fi
644599
TOOLCHAIN_CFLAGS_JDK_CXXONLY="$TOOLCHAIN_CFLAGS_JDK_CXXONLY $LANGSTD_CXXFLAGS"
645600
TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $LANGSTD_CXXFLAGS"
@@ -658,8 +613,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
658613
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
659614
WARNING_CFLAGS="$WARNINGS_ENABLE_ALL"
660615
661-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
662-
WARNING_CFLAGS="" # currently left empty
663616
fi
664617
665618
# Set some additional per-OS defines.
@@ -684,31 +637,16 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
684637
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
685638
PICFLAG="-fPIC"
686639
PIEFLAG="-fPIE"
687-
elif test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
688-
JVM_PICFLAG="-fpic -mcmodel=large -Wl,-bbigtoc
689-
JDK_PICFLAG="-fpic
690-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
691-
# '-qpic' defaults to 'qpic=small'. This means that the compiler generates only
692-
# one instruction for accessing the TOC. If the TOC grows larger than 64K, the linker
693-
# will have to patch this single instruction with a call to some out-of-order code which
694-
# does the load from the TOC. This is of course slower, and we also would have
695-
# to use '-bbigtoc' for linking anyway so we could also change the PICFLAG to 'qpic=large'.
696-
# With 'qpic=large' the compiler will by default generate a two-instruction sequence which
697-
# can be patched directly by the linker and does not require a jump to out-of-order code.
698-
#
699-
# Since large TOC causes perf. overhead, only pay it where we must. Currently this is
700-
# for all libjvm variants (both gtest and normal) but no other binaries. So, build
701-
# libjvm with -qpic=large and link with -bbigtoc.
702-
JVM_PICFLAG="-qpic=large"
703-
JDK_PICFLAG="-qpic"
704640
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
705641
PICFLAG=""
706642
fi
707643
708-
if test "x$TOOLCHAIN_TYPE" != xxlc; then
644+
if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
645+
JVM_PICFLAG="-fpic -mcmodel=large"
646+
else
709647
JVM_PICFLAG="$PICFLAG"
710-
JDK_PICFLAG="$PICFLAG"
711648
fi
649+
JDK_PICFLAG="$PICFLAG"
712650
713651
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
714652
# Linking is different on MacOSX
@@ -758,8 +696,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
758696
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DARCH='\"$FLAGS_CPU_LEGACY\"' \
759697
-D$FLAGS_CPU_LEGACY"
760698
761-
if test "x$FLAGS_CPU_BITS" = x64 && test "x$FLAGS_OS" != xaix; then
762-
# xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
699+
if test "x$FLAGS_CPU_BITS" = x64; then
763700
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
764701
$1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
765702
fi
@@ -836,11 +773,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
836773
$1_CFLAGS_CPU="-mcpu=pwr8"
837774
fi
838775
839-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
840-
if test "x$FLAGS_CPU" = xppc64; then
841-
$1_CFLAGS_CPU_JVM="-qarch=ppc64"
842-
fi
843-
844776
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
845777
if test "x$FLAGS_CPU" = xx86; then
846778
$1_CFLAGS_CPU_JVM="-arch:IA32"

make/autoconf/flags-ldflags.m4

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
8686
-Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
8787
BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
8888
fi
89-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
90-
BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bnoexpall -bernotok -btextpsize:64K \
91-
-bdatapsize:64K -bstackpsize:64K"
92-
# libjvm.so has gotten too large for normal TOC size; compile with qpic=large and link with bigtoc
93-
BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r -bbigtoc"
9489
9590
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
9691
BASIC_LDFLAGS="-opt:ref"
@@ -120,14 +115,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
120115
fi
121116
fi
122117
123-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
124-
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
125-
# Hotspot now overflows its 64K TOC (currently only for debug),
126-
# so we build with '-qpic=large -bbigtoc'.
127-
if test "x$DEBUG_LEVEL" != xrelease; then
128-
DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -bbigtoc"
129-
fi
130-
131118
elif test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
132119
# We need '-fpic' or '-fpic -mcmodel=large -Wl,-bbigtoc' if the TOC overflows.
133120
# Hotspot now overflows its 64K TOC (currently only for debug),

make/autoconf/flags.m4

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,9 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
261261
# The sysroot flags are needed for configure to be able to run the compilers
262262
FLAGS_SETUP_SYSROOT_FLAGS
263263
264-
# For xlc, the word size flag is required for correct behavior.
265264
# For clang/gcc, the flag is only strictly required for reduced builds, but
266265
# set it always where possible (x86 and ppc).
267-
if test "x$TOOLCHAIN_TYPE" = xxlc; then
268-
MACHINE_FLAG="-q${OPENJDK_TARGET_CPU_BITS}"
269-
elif test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
266+
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
270267
if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86 &&
271268
test "x$OPENJDK_TARGET_CPU" != xx32 ||
272269
test "x$OPENJDK_TARGET_CPU_ARCH" = xppc; then
@@ -321,47 +318,6 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
321318

322319
AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
323320
[
324-
# COMPILER_TARGET_BITS_FLAG : option for selecting 32- or 64-bit output
325-
# COMPILER_COMMAND_FILE_FLAG : option for passing a command file to the compiler
326-
# COMPILER_BINDCMD_FILE_FLAG : option for specifying a file which saves the binder
327-
# commands produced by the link step (currently AIX only)
328-
if test "x$TOOLCHAIN_TYPE" = xxlc; then
329-
COMPILER_TARGET_BITS_FLAG="-q"
330-
COMPILER_COMMAND_FILE_FLAG="-f"
331-
COMPILER_BINDCMD_FILE_FLAG="-bloadmap:"
332-
else
333-
COMPILER_TARGET_BITS_FLAG="-m"
334-
COMPILER_COMMAND_FILE_FLAG="@"
335-
COMPILER_BINDCMD_FILE_FLAG=""
336-
337-
# Check if @file is supported by gcc
338-
if test "x$TOOLCHAIN_TYPE" = xgcc; then
339-
AC_MSG_CHECKING([if @file is supported by gcc])
340-
# Extra empty "" to prevent ECHO from interpreting '--version' as argument
341-
$ECHO "" "--version" > command.file
342-
# Redirect stderr and stdout to config.log (AS_MESSAGE_LOG_FD) via merge
343-
if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
344-
AC_MSG_RESULT(yes)
345-
COMPILER_COMMAND_FILE_FLAG="@"
346-
else
347-
AC_MSG_RESULT(no)
348-
COMPILER_COMMAND_FILE_FLAG=
349-
fi
350-
$RM command.file
351-
fi
352-
fi
353-
354-
AC_SUBST(COMPILER_TARGET_BITS_FLAG)
355-
AC_SUBST(COMPILER_COMMAND_FILE_FLAG)
356-
AC_SUBST(COMPILER_BINDCMD_FILE_FLAG)
357-
358-
# Check that the compiler supports -mX (or -qX on AIX) flags
359-
# Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
360-
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
361-
IF_TRUE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
362-
IF_FALSE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
363-
AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
364-
365321
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
366322
CC_OUT_OPTION=-Fo
367323
else
@@ -376,8 +332,6 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
376332
GENDEPS_FLAGS="-MMD -MF"
377333
elif test "x$TOOLCHAIN_TYPE" = xclang; then
378334
GENDEPS_FLAGS="-MMD -MF"
379-
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
380-
GENDEPS_FLAGS="-qmakedep=gcc -MF"
381335
fi
382336
AC_SUBST(GENDEPS_FLAGS)
383337
])

make/autoconf/spec.gmk.template

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ MACOSX_VERSION_MAX := @MACOSX_VERSION_MAX@
477477
MACOSX_CODESIGN_MODE := @MACOSX_CODESIGN_MODE@
478478
MACOSX_CODESIGN_IDENTITY := @MACOSX_CODESIGN_IDENTITY@
479479

480-
# Toolchain type: gcc, clang, xlc, microsoft...
480+
# Toolchain type: gcc, clang, microsoft...
481481
TOOLCHAIN_TYPE := @TOOLCHAIN_TYPE@
482482
TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
483483
CC_VERSION_NUMBER := @CC_VERSION_NUMBER@
@@ -486,17 +486,6 @@ CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
486486
# Legacy support
487487
HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
488488

489-
# Option used to tell the compiler whether to create 32- or 64-bit executables
490-
COMPILER_TARGET_BITS_FLAG := @COMPILER_TARGET_BITS_FLAG@
491-
COMPILER_SUPPORTS_TARGET_BITS_FLAG := @COMPILER_SUPPORTS_TARGET_BITS_FLAG@
492-
493-
# Option used to pass a command file to the compiler
494-
COMPILER_COMMAND_FILE_FLAG := @COMPILER_COMMAND_FILE_FLAG@
495-
496-
# Option for specifying a file which saves the binder commands
497-
# produced by the link step (for debugging, currently AIX only)
498-
COMPILER_BINDCMD_FILE_FLAG := @COMPILER_BINDCMD_FILE_FLAG@
499-
500489
CC_OUT_OPTION := @CC_OUT_OPTION@
501490

502491
# Flags used for overriding the default opt setting for a C/C++ source file.

0 commit comments

Comments
 (0)