jdk-sandbox: comparison common/autoconf/toolchain.m4

equal deleted inserted replaced

-:51cc970b1b88
+:25aaf85d1ada
 AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.])
 else
 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/p"`
 COMPILER_VENDOR="Sun Studio"
 fi
+elif test  "x$OPENJDK_TARGET_OS" = xaix; then
+COMPILER_VERSION_TEST=`$COMPILER -qversion  2>&1 | $TAIL -n 1`
+$ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
+if test $? -ne 0; then
+AC_MSG_ERROR([Failed to detect the compiler version of $COMPILER ....])
+else
+COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \([0-9][0-9]\.[0-9][0-9]*\).*/\1/p'`
+COMPILER_VENDOR='IBM'
+fi
 elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
 # First line typically looks something like:
 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
 if test "x[$]$1" = x; then
 HELP_MSG_MISSING_DEPENDENCY([devkit])
 AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
 fi
 BASIC_FIXUP_EXECUTABLE($1)
-AC_MSG_CHECKING([resolved symbolic links for $1])
 TEST_COMPILER="[$]$1"
-BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
+# Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
-AC_MSG_RESULT([$TEST_COMPILER])
+# to 'xlc' but it is crucial that we invoke the compiler with the right name!
+if test "x$OPENJDK_BUILD_OS" != xaix; then
+AC_MSG_CHECKING([resolved symbolic links for $1])
+BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
+AC_MSG_RESULT([$TEST_COMPILER])
+fi
 AC_MSG_CHECKING([if $1 is disguised ccache])
 COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
 if test "x$COMPILER_BASENAME" = "xccache"; then
 AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
 COMPILER_CHECK_LIST="$CC"
 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 COMPILER_CHECK_LIST="cl"
 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 COMPILER_CHECK_LIST="cc gcc"
+elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
+# Do not probe for cc on AIX.
+COMPILER_CHECK_LIST="xlc_r"
 else
 COMPILER_CHECK_LIST="gcc cc"
 fi
 TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
 # Now that we have resolved CC ourself, let autoconf have its go at it
 AC_PROG_CC([$CC])
+# Option used to tell the compiler whether to create 32- or 64-bit executables
+# Notice that CC contains the full compiler path at this point.
+case $CC in
+*xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
+*)      COMPILER_TARGET_BITS_FLAG="-m";;
+esac
+AC_SUBST(COMPILER_TARGET_BITS_FLAG)
 ### Locate C++ compiler (CXX)
 if test "x$CXX" != x; then
 COMPILER_CHECK_LIST="$CXX"
 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 COMPILER_CHECK_LIST="cl"
 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 COMPILER_CHECK_LIST="CC g++"
+elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
+# Do not probe for CC on AIX .
+COMPILER_CHECK_LIST="xlC_r"
 else
 COMPILER_CHECK_LIST="g++ CC"
 fi
 TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
 AC_CHECK_TOOL(AR, ar)
 BASIC_FIXUP_EXECUTABLE(AR)
 fi
 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 ARFLAGS="-r"
+elif test "x$OPENJDK_TARGET_OS" = xaix; then
+ARFLAGS="-X64"
 else
 ARFLAGS=""
 fi
 AC_SUBST(ARFLAGS)
 AS_IF([test "x$VARIANT" = xOPT], [
 RC_FLAGS="$RC_FLAGS -d NDEBUG"
 ])
 # The version variables used to create RC_FLAGS may be overridden
 # in a custom configure script, or possibly the command line.
 # Let those variables be expanded at make time in spec.gmk.
 # The \$ are escaped to the shell, and the $(...) variables
 # are evaluated by make.
 RC_FLAGS="$RC_FLAGS \
 -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
 CFLAGS_JDKLIB_EXTRA='-xstrconst'
 POST_STRIP_CMD="$STRIP -x"
 POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
+fi
+if test "x$OPENJDK_TARGET_OS" = xaix; then
+COMPILER_NAME=xlc
+PICFLAG="-qpic=large"
+LIBRARY_PREFIX=lib
+SHARED_LIBRARY='lib[$]1.so'
+STATIC_LIBRARY='lib[$]1.a'
+SHARED_LIBRARY_FLAGS="-qmkshrobj"
+SHARED_LIBRARY_SUFFIX='.so'
+STATIC_LIBRARY_SUFFIX='.a'
+OBJ_SUFFIX='.o'
+EXE_SUFFIX=''
+SET_SHARED_LIBRARY_NAME=''
+SET_SHARED_LIBRARY_MAPFILE=''
+C_FLAG_REORDER=''
+CXX_FLAG_REORDER=''
+SET_SHARED_LIBRARY_ORIGIN=''
+SET_EXECUTABLE_ORIGIN=""
+CFLAGS_JDK=""
+CXXFLAGS_JDK=""
+CFLAGS_JDKLIB_EXTRA=''
+POST_STRIP_CMD="$STRIP -X32_64"
+POST_MCS_CMD=""
 fi
 if test "x$OPENJDK_TARGET_OS" = xwindows; then
 # If it is not gcc, then assume it is the MS Visual Studio compiler
 COMPILER_NAME=cl
 PICFLAG=""
 CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
 CXX_O_FLAG_NONE=""
 ;;
 esac
 CFLAGS_DEBUG_SYMBOLS="-g -xs"
 CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
+;;
+xlc )
+C_FLAG_DEPS="-qmakedep=gcc -MF"
+CXX_FLAG_DEPS="-qmakedep=gcc -MF"
+C_O_FLAG_HIGHEST="-O3"
+C_O_FLAG_HI="-O3 -qstrict"
+C_O_FLAG_NORM="-O2"
+C_O_FLAG_NONE=""
+CXX_O_FLAG_HIGHEST="-O3"
+CXX_O_FLAG_HI="-O3 -qstrict"
+CXX_O_FLAG_NORM="-O2"
+CXX_O_FLAG_NONE=""
+CFLAGS_DEBUG_SYMBOLS="-g"
+CXXFLAGS_DEBUG_SYMBOLS="-g"
+LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
+CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
+CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
+;;
 esac
 ;;
 CL )
 C_O_FLAG_HIGHEST="-O2"
 C_O_FLAG_HI="-O1"
 	  CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
 LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
 ;;
+xlc )
+CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
+CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
+LDFLAGS_JDK="$LDFLAGS_JDK"
+LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK"
+;;
 cl )
 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
 	       -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
 	       -DWIN32 -DIAL"
 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DWINDOWS"
 fi
 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
 fi
+if test "x$OPENJDK_TARGET_OS" = xaix; then
+CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DAIX -DPPC64"
+fi
 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
 # Setting these parameters makes it an error to link to macosx APIs that are
 # newer than the given OS version and makes the linked binaries compatible even
 # if built on a newer version of the OS.
 [
 # Some Zero and Shark settings.
 # ZERO_ARCHFLAG tells the compiler which mode to build for
 case "${OPENJDK_TARGET_CPU}" in
 s390)
-ZERO_ARCHFLAG="-m31"
+ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
 ;;
 *)
-ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
 esac
 TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
 AC_SUBST(ZERO_ARCHFLAG)
-# Check that the compiler supports -mX flags
+# Check that the compiler supports -mX (or -qX on AIX) flags
 # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
-TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([-m${OPENJDK_TARGET_CPU_BITS}],
+TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
 AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)

changeset 22466	25aaf85d1ada
parent 22465	51cc970b1b88
child 22467	b16a5ae55d50