--- a/common/autoconf/toolchain.m4 Tue Jan 28 11:21:26 2014 -0800
+++ b/common/autoconf/toolchain.m4 Tue Jan 28 14:10:47 2014 -0800
@@ -44,6 +44,15 @@
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.40219.01 for 80x86
@@ -161,10 +170,14 @@
# Now we have a compiler binary in $1. Make sure it's okay.
BASIC_FIXUP_EXECUTABLE($1)
- AC_MSG_CHECKING([resolved symbolic links for $1])
TEST_COMPILER="[$]$1"
- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
- AC_MSG_RESULT([$TEST_COMPILER])
+ # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
+ # 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"`
@@ -276,6 +289,9 @@
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
@@ -284,12 +300,23 @@
# 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$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
@@ -331,6 +358,8 @@
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
ARFLAGS="-r"
+ elif test "x$OPENJDK_TARGET_OS" = xaix; then
+ ARFLAGS="-X64"
else
ARFLAGS=""
fi
@@ -574,6 +603,29 @@
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
@@ -750,6 +802,24 @@
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 )
@@ -860,6 +930,13 @@
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 \
@@ -929,6 +1006,9 @@
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
@@ -1096,20 +1176,38 @@
# 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)
+
+
+ # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed in executable.'
+ USING_BROKEN_SUSE_LD=no
+ if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$GCC" = xyes; then
+ AC_MSG_CHECKING([for broken SuSE 'ld' which only understands anonymous version tags in executables])
+ echo "SUNWprivate_1.1 { local: *; };" > version-script.map
+ echo "int main() { }" > main.c
+ if $CXX -Xlinker -version-script=version-script.map main.c 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
+ AC_MSG_RESULT(no)
+ USING_BROKEN_SUSE_LD=no
+ else
+ AC_MSG_RESULT(yes)
+ USING_BROKEN_SUSE_LD=yes
+ fi
+ rm -rf version-script.map main.c
+ fi
+ AC_SUBST(USING_BROKEN_SUSE_LD)
])
# Setup the JTREG paths