@@ -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],
219211AC_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"
0 commit comments