Date: Sun, 9 Nov 2014 05:23:32 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372338 - in head/java: openjdk8 openjdk8-jre openjdk8/files Message-ID: <201411090523.sA95NWMT062480@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Nov 9 05:23:31 2014 New Revision: 372338 URL: https://svnweb.freebsd.org/changeset/ports/372338 QAT: https://qat.redports.org/buildarchive/r372338/ Log: . Update to 8u25. Added: head/java/openjdk8/files/nashorn-test-script-jfx-flyingimage-golden-bsd.png (contents, props changed) head/java/openjdk8/files/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png (contents, props changed) head/java/openjdk8/files/nashorn-test-script-jfx-spread-golden-bsd.png (contents, props changed) head/java/openjdk8/files/patch-8u20-b26 (contents, props changed) head/java/openjdk8/files/patch-8u25-b17 (contents, props changed) Deleted: head/java/openjdk8/files/patch-hotspot__make__bsd__makefiles__adjust-mflags.sh head/java/openjdk8/files/patch-make-common-MakeBase.gmk Modified: head/java/openjdk8-jre/Makefile head/java/openjdk8/Makefile head/java/openjdk8/files/patch-bsd head/java/openjdk8/files/patch-bsd-test head/java/openjdk8/files/patch-common-autoconf-toolchain.m4 head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk Modified: head/java/openjdk8-jre/Makefile ============================================================================== --- head/java/openjdk8-jre/Makefile Sun Nov 9 05:22:29 2014 (r372337) +++ head/java/openjdk8-jre/Makefile Sun Nov 9 05:23:31 2014 (r372338) @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 5 PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Sun Nov 9 05:22:29 2014 (r372337) +++ head/java/openjdk8/Makefile Sun Nov 9 05:23:31 2014 (r372338) @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION?= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ @@ -38,6 +37,15 @@ ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME} DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \ + jdk/src/bsd/doc/man/java.1 \ + jdk/src/bsd/doc/man/javac.1 \ + jdk/src/bsd/doc/man/javap.1 \ + jdk/src/linux/doc/man/java.1 \ + jdk/src/linux/doc/man/javac.1 \ + jdk/src/linux/doc/man/javap.1 \ + jdk/src/solaris/doc/sun/man/man1/java.1 \ + jdk/src/solaris/doc/sun/man/man1/javac.1 \ + jdk/src/solaris/doc/sun/man/man1/javap.1 \ nashorn/test/script/jfx.js SHEBANG_FILES= configure @@ -62,8 +70,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 11 -JDK_BUILD_NUMBER= 12 +JDK_UPDATE_VERSION= 25 +JDK_BUILD_NUMBER= 17 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 @@ -163,33 +171,20 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICON .endif post-extract: - @${MV} -f ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug \ - ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx - @${MV} -f ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product \ - ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product.macosx - @${CP} -f ${WRKSRC}/hotspot/make/linux/makefiles/mapfile-vers-debug \ - ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug - @${CP} -f ${WRKSRC}/hotspot/make/linux/makefiles/mapfile-vers-product \ - ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product - @${MKDIR} ${WRKSRC}/jdk/src/bsd/classes/java/net \ - ${WRKSRC}/jdk/src/bsd/classes/sun/nio/ch - @${MV} -f ${WRKSRC}/jdk/src/macosx/classes/java/net/DefaultInterface.java \ - ${WRKSRC}/jdk/src/bsd/classes/java/net - @${MV} -f ${WRKSRC}/jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java \ - ${WRKSRC}/jdk/src/bsd/classes/sun/nio/ch - @${MV} -f ${WRKSRC}/jdk/src/macosx/classes/sun/nio/ch/KQueue*.java \ - ${WRKSRC}/jdk/src/solaris/classes/sun/nio/ch - @${MV} -f ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch/KQueue*.c \ - ${WRKSRC}/jdk/src/solaris/native/sun/nio/ch - @${RMDIR} ${WRKSRC}/jdk/src/macosx/classes/java/net \ - ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch \ - ${WRKSRC}/jdk/src/macosx/native/sun/nio - @${CP} -f ${WRKSRC}/jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd \ - ${WRKSRC}/jdk/src/solaris/classes/java/lang/UNIXProcess.java.macosx - @${CP} -f ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \ + @${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \ ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg + @${CP} ${FILESDIR}/nashorn-test-script-jfx-flyingimage-golden-bsd.png \ + ${WRKSRC}/nashorn/test/script/jfx/flyingimage/golden/bsd.png + @${CP} ${FILESDIR}/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png \ + ${WRKSRC}/nashorn/test/script/jfx/kaleidoscope/golden/bsd.png + @${CP} ${FILESDIR}/nashorn-test-script-jfx-spread-golden-bsd.png \ + ${WRKSRC}/nashorn/test/script/jfx/spread/golden/bsd.png post-patch: + @${FIND} ${WRKSRC} -name '*.orig' -delete + @${RMDIR} ${WRKSRC}/jdk/src/macosx/classes/java/net \ + ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch \ + ${WRKSRC}/jdk/src/macosx/native/sun/nio @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${FILESDIR}/bsd.fontconfig.properties.in > \ ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Added: head/java/openjdk8/files/nashorn-test-script-jfx-flyingimage-golden-bsd.png ============================================================================== Binary file. No diff available. Added: head/java/openjdk8/files/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png ============================================================================== Binary file. No diff available. Added: head/java/openjdk8/files/nashorn-test-script-jfx-spread-golden-bsd.png ============================================================================== Binary file. No diff available. Added: head/java/openjdk8/files/patch-8u20-b26 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-8u20-b26 Sun Nov 9 05:23:31 2014 (r372338) @@ -0,0 +1,404059 @@ +--- ./.hgtags Tue Jun 03 14:19:17 2014 -0700 ++++ ./.hgtags Wed Jul 30 03:50:56 2014 -0700 +@@ -245,12 +245,18 @@ + 1e1f86d5d4e22c15a9bf9f1581acddb8c59abae2 jdk8-b121 + 347009c5881668b1e44f64d56d4a96cb20a183fa jdk8-b122 + ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123 ++c330fa67c4daffdc86527f1a24941aa5a3500098 jdk8u20-b00 + 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124 ++78abb27c27d988a86e6c82b2cce03cdc04211127 jdk8u20-b01 + 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125 + 9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126 + 2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127 + 101e42de46869e6604fbf095e1666fbf07fcb93c jdk8-b128 + 1e5fe865491300cd0c63261ecf8d34e621e1345c jdk8-b129 ++cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02 ++6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03 ++7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04 ++69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05 + 839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130 + 0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131 + 2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132 +@@ -268,6 +274,7 @@ + dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11 + 3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12 + d81e301cae70f1f95f4bb976ec053c915dee503a jdk8u5-b13 ++19dd42ebf97c187fbf53884f45dca84274909c3e jdk8u5-b31 + 397902f53444be14aa4e261cd47064fac82919c9 jdk8u11-b01 + 6ffd41be920a3e63c5767f36ac725e9e3bf5ec50 jdk8u11-b02 + 3078ab9b8d4ad37cf18bf6a1ed49c8015e70ec73 jdk8u11-b03 +@@ -279,3 +286,30 @@ + 390084098df7bffecd0eb2318facc6f0f9a46b70 jdk8u11-b09 + 6d324f36e2448f486d0caa67f70e5a6cf5ac6c0d jdk8u11-b10 + f0b9fee1d40a6aae31be4780f70aba02148ec54c jdk8u11-b11 ++e85bf9b28eb7f4098eeb25ba0e3afed34058ef09 jdk8u11-b12 ++66b17e2403b04cfe98dc1cce270f15ed817d0336 jdk8u11-b31 ++ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06 ++cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02 ++6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03 ++7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04 ++69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05 ++ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06 ++6403ef94cb0db32d9221a5e8f09f3664cd7744dc jdk8u20-b07 ++b7750b6ee1578fd5b2b1f6758f905b332503d8ed jdk8u20-b08 ++d420eae635c42be98b166e1ce9c64fc0a8825529 jdk8u20-b09 ++cc4ca2ff0afcfb932da6fa4fffdd01f08e4ff71b jdk8u20-b10 ++61291eee163ab5bbe0b38b37b77673bac9bf5310 jdk8u20-b11 ++2feecdcd7b677f3baf9df6e8ea46f7e08c7e4411 jdk8u20-b12 ++26764db977ecb590cdee637d27996a87cdd9507e jdk8u20-b13 ++548afd2496385263874c0ce970158764166b1156 jdk8u20-b14 ++12a1fd80b05aa9c5daab22ca5fab8e2c9c3df61c jdk8u20-b15 ++4095a7a49a9ea95f4c59f936acf45ca1f87b8fff jdk8u20-b16 ++3a49a08a2e3991a10e6bec531e9dbfa7c503fcb4 jdk8u20-b17 ++1695032e51faa36ed9c39b2817baa374ca361513 jdk8u20-b18 ++2f40422f564b892a26cb04c62885bb5bc85984e3 jdk8u20-b19 ++5b76ecd0cdcf899261da2c9965862771f6da4e26 jdk8u20-b20 ++0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u20-b21 ++6c1fb59fa5d7095d93a023553a949f873f324c6b jdk8u20-b22 ++b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23 ++1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24 ++1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25 +--- ./THIRD_PARTY_README Tue Jun 03 14:19:17 2014 -0700 ++++ ./THIRD_PARTY_README Wed Jul 30 03:50:56 2014 -0700 +@@ -2,7 +2,7 @@ + ----------------------------- + + %% This notice is provided with respect to ASM Bytecode Manipulation +-Framework v5.0, which may be included with JRE 8, and JDK 8, and ++Framework v5.0.3, which may be included with JRE 8, and JDK 8, and + OpenJDK 8. + + --- begin of LICENSE --- +@@ -1471,7 +1471,7 @@ + version 2.0. + + The NSS libraries are supplied in executable form, built from unmodified +-NSS source code labeled with the "NSS_3.13.1_RTM" release tag. ++NSS source code labeled with the "NSS_3_16_RTM" HG tag. + + The NSS source code is available in the OpenJDK source code repository at: + jdk/test/sun/security/pkcs11/nss/src +@@ -3349,14 +3349,14 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to zlib v1.2.5, which may be included ++%% This notice is provided with respect to zlib v1.2.8, which may be included + with JRE 8, JDK 8, and OpenJDK 8. + + --- begin of LICENSE --- + +- version 1.2.5, July 18th, 2005 +- +- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler ++ version 1.2.8, April 28th, 2013 ++ ++ Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages +@@ -3382,11 +3382,11 @@ + ------------------------------------------------------------------------------- + + %% This notice is provided with respect to the following which may be +-included with JRE 8, JDK 8, and OpenJDK 8, except where noted: +- +- Apache Commons Math 2.2 +- Apache Derby 10.10.1.2 [included with JDK 8] +- Apache Jakarta BCEL 5.2 ++included with JRE 8, JDK 8, and OpenJDK 8. ++ ++ Apache Commons Math 3.2 ++ Apache Derby 10.10.1.3 ++ Apache Jakarta BCEL 5.1 + Apache Jakarta Regexp 1.4 + Apache Santuario XML Security for Java 1.5.4 + Apache Xalan-Java 2.7.1 +--- ./common/autoconf/boot-jdk.m4 Tue Jun 03 14:19:17 2014 -0700 ++++ ./common/autoconf/boot-jdk.m4 Wed Jul 30 03:50:56 2014 -0700 +@@ -316,7 +316,7 @@ + + # Minimum amount of heap memory. + ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA]) +- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then ++ if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then + # Why does macosx need more heap? Its the huge JDK batch. + ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) + else +--- ./common/autoconf/build-aux/config.guess Tue Jun 03 14:19:17 2014 -0700 ++++ ./common/autoconf/build-aux/config.guess Wed Jul 30 03:50:56 2014 -0700 +@@ -60,4 +60,30 @@ + esac + fi + ++# Test and fix architecture string on AIX ++# On AIX 'config.guess' returns 'powerpc' as architecture but 'powerpc' is ++# implicitely handled as 32-bit architecture in 'platform.m4' so we check ++# for the kernel mode rewrite it to 'powerpc64' if we'Re running in 64-bit mode. ++# The check could also be done with `/usr/sbin/prtconf | grep "Kernel Type" | grep "64-bit"` ++echo $OUT | grep powerpc-ibm-aix > /dev/null 2> /dev/null ++if test $? = 0; then ++ if [ -x /bin/getconf ] ; then ++ KERNEL_BITMODE=`getconf KERNEL_BITMODE` ++ if [ "$KERNEL_BITMODE" = "32" ]; then ++ KERNEL_BITMODE="" ++ fi ++ fi ++ OUT=powerpc$KERNEL_BITMODE`echo $OUT | sed -e 's/[^-]*//'` ++fi ++ ++# Test and fix little endian PowerPC64. ++# TODO: should be handled by autoconf-config.guess. ++if [ "x$OUT" = x ]; then ++ if [ `uname -m` = ppc64le ]; then ++ if [ `uname -s` = Linux ]; then ++ OUT=powerpc64le-unknown-linux-gnu ++ fi ++ fi ++fi ++ + echo $OUT +--- ./common/autoconf/build-performance.m4 Tue Jun 03 14:19:17 2014 -0700 ++++ ./common/autoconf/build-performance.m4 Wed Jul 30 03:50:56 2014 -0700 +@@ -41,6 +41,9 @@ + # Looks like a MacOSX system + NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` + FOUND_CORES=yes ++ elif test "x$OPENJDK_BUILD_OS" = xaix ; then ++ NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` ++ FOUND_CORES=yes + elif test -n "$NUMBER_OF_PROCESSORS"; then + # On windows, look in the env + NUM_CORES=$NUMBER_OF_PROCESSORS +@@ -68,8 +71,8 @@ + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` + FOUND_MEM=yes + elif test -x /usr/sbin/prtconf; then +- # Looks like a Solaris system +- MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'` ++ # Looks like a Solaris or AIX system ++ MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'` + FOUND_MEM=yes + elif test -x /usr/sbin/system_profiler; then + # Looks like a MacOSX system +--- ./common/autoconf/configure.ac Tue Jun 03 14:19:17 2014 -0700 ++++ ./common/autoconf/configure.ac Wed Jul 30 03:50:56 2014 -0700 +@@ -88,6 +88,7 @@ + + # These are needed to be able to create a configuration name (and thus the output directory) + JDKOPT_SETUP_JDK_VARIANT ++JDKOPT_SETUP_JVM_INTERPRETER + JDKOPT_SETUP_JVM_VARIANTS + JDKOPT_SETUP_DEBUG_LEVEL + +--- ./common/autoconf/generated-configure.sh Tue Jun 03 14:19:17 2014 -0700 ++++ ./common/autoconf/generated-configure.sh Wed Jul 30 03:50:56 2014 -0700 +@@ -665,6 +665,7 @@ + CFLAGS_DEBUG_SYMBOLS + ZIP_DEBUGINFO_FILES + ENABLE_DEBUG_SYMBOLS ++USING_BROKEN_SUSE_LD + COMPILER_SUPPORTS_TARGET_BITS_FLAG + ZERO_ARCHFLAG + LDFLAGS_CXX_JDK +@@ -749,6 +750,7 @@ + PROPER_COMPILER_CXX + POTENTIAL_CXX + TOOLS_DIR_CXX ++COMPILER_TARGET_BITS_FLAG + OBJEXT + EXEEXT + ac_ct_CC +@@ -851,6 +853,7 @@ + DEBUG_LEVEL + MACOSX_UNIVERSAL + INCLUDE_SA ++JVM_VARIANT_CORE + JVM_VARIANT_ZEROSHARK + JVM_VARIANT_ZERO + JVM_VARIANT_KERNEL +@@ -858,6 +861,7 @@ + JVM_VARIANT_CLIENT + JVM_VARIANT_SERVER + JVM_VARIANTS ++JVM_INTERPRETER + JDK_VARIANT + SET_OPENJDK + BUILD_LOG_WRAPPER +@@ -1003,6 +1007,7 @@ + with_devkit + enable_openjdk_only + with_jdk_variant ++with_jvm_interpreter + with_jvm_variants + enable_debug + with_debug_level +@@ -1747,8 +1752,10 @@ + --with-devkit use this directory as base for tools-dir and + sys-root (for cross-compiling) + --with-jdk-variant JDK variant to build (normal) [normal] ++ --with-jvm-interpreter JVM interpreter to build (template, cpp) [template] + --with-jvm-variants JVM variants (separated by commas) to build (server, +- client, minimal1, kernel, zero, zeroshark) [server] ++ client, minimal1, kernel, zero, zeroshark, core) ++ [server] + --with-debug-level set the debug level (release, fastdebug, slowdebug) + [release] + --with-conf-name use this as the name of the configuration [generated +@@ -3485,8 +3492,6 @@ + If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically." + fi + ;; +- * ) +- break ;; + esac + } + +@@ -3512,8 +3517,6 @@ + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;; + ccache) + PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; +- * ) +- break ;; + esac + } + +@@ -3535,8 +3538,6 @@ + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;; + ccache) + PKGHANDLER_COMMAND="sudo yum install ccache" ;; +- * ) +- break ;; + esac + } + +@@ -3586,6 +3587,8 @@ + + + ++ ++ + ############################################################################### + # + # Should we build only OpenJDK even if closed sources are present? +@@ -3865,7 +3868,7 @@ + #CUSTOM_AUTOCONF_INCLUDE + + # Do not change or remove the following line, it is needed for consistency checks: +-DATE_WHEN_GENERATED=1390334534 ++DATE_WHEN_GENERATED=1397150809 + + ############################################################################### + # +@@ -6784,6 +6787,11 @@ + VAR_OS_API=winapi + VAR_OS_ENV=windows.msys + ;; ++ *aix*) ++ VAR_OS=aix ++ VAR_OS_API=posix ++ VAR_OS_ENV=aix ++ ;; + *) + as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5 + ;; +@@ -6822,6 +6830,12 @@ + VAR_CPU_BITS=64 + VAR_CPU_ENDIAN=big + ;; ++ powerpc64le) ++ VAR_CPU=ppc64 ++ VAR_CPU_ARCH=ppc ++ VAR_CPU_BITS=64 ++ VAR_CPU_ENDIAN=little ++ ;; + s390) + VAR_CPU=s390 + VAR_CPU_ARCH=s390 +@@ -6904,6 +6918,11 @@ + VAR_OS_API=winapi + VAR_OS_ENV=windows.msys + ;; ++ *aix*) ++ VAR_OS=aix ++ VAR_OS_API=posix ++ VAR_OS_ENV=aix ++ ;; + *) + as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5 + ;; +@@ -6942,6 +6961,12 @@ + VAR_CPU_BITS=64 + VAR_CPU_ENDIAN=big + ;; ++ powerpc64le) ++ VAR_CPU=ppc64 ++ VAR_CPU_ARCH=ppc ++ VAR_CPU_BITS=64 ++ VAR_CPU_ENDIAN=little ++ ;; + s390) + VAR_CPU=s390 + VAR_CPU_ARCH=s390 +@@ -7810,6 +7835,37 @@ + $as_echo "$JDK_VARIANT" >&6; } + + ++############################################################################### ++# ++# Check which interpreter of the JVM we want to build. ++# Currently we have: ++# template: Template interpreter (the default) ++# cpp : C++ interpreter ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which interpreter of the JVM to build" >&5 ++$as_echo_n "checking which interpreter of the JVM to build... " >&6; } ++ ++# Check whether --with-jvm-interpreter was given. ++if test "${with_jvm_interpreter+set}" = set; then : ++ withval=$with_jvm_interpreter; ++fi ++ ++ ++if test "x$with_jvm_interpreter" = x; then ++ with_jvm_interpreter="template" ++fi ++ ++JVM_INTERPRETER="$with_jvm_interpreter" ++ ++if test "x$JVM_INTERPRETER" != xtemplate && test "x$JVM_INTERPRETER" != xcpp; then ++ as_fn_error $? "The available JVM interpreters are: template, cpp" "$LINENO" 5 ++fi ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_interpreter" >&5 ++$as_echo "$with_jvm_interpreter" >&6; } ++ ++ + + ############################################################################### + # +@@ -7822,6 +7878,7 @@ + # ie normal interpreter and C1, only the serial GC, kernel jvmti etc + # zero: no machine code interpreter, no compiler + # zeroshark: zero interpreter and shark/llvm compiler backend ++# core: interpreter only, no compiler (only works on some platforms) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5 + $as_echo_n "checking which variants of the JVM to build... " >&6; } + +@@ -7836,10 +7893,10 @@ + fi + + JVM_VARIANTS=",$with_jvm_variants," +- TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` ++ TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'` + + if test "x$TEST_VARIANTS" != "x,"; then +- as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5 ++ as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5 + $as_echo "$with_jvm_variants" >&6; } +@@ -7850,6 +7907,7 @@ + JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` + JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` + JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` ++ JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'` + + if test "x$JVM_VARIANT_CLIENT" = xtrue; then + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then +@@ -7869,7 +7927,7 @@ + + # Replace the commas with AND for use in the build directory name. + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` +- COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` ++ COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'` + if test "x$COUNT_VARIANTS" != "x,1"; then + BUILDING_MULTIPLE_JVM_VARIANTS=yes + else +@@ -7884,6 +7942,7 @@ + + + ++ + INCLUDE_SA=true + if test "x$JVM_VARIANT_ZERO" = xtrue ; then + INCLUDE_SA=false +@@ -7891,6 +7950,9 @@ + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then + INCLUDE_SA=false + fi ++ if test "x$VAR_CPU" = xppc64 ; then ++ INCLUDE_SA=false ++ fi + + + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then +@@ -8006,6 +8068,10 @@ + HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark " + fi + ++ if test "x$JVM_VARIANT_CORE" = xtrue; then ++ HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core " ++ fi ++ + HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT" + + # On Macosx universal binaries are produced, but they only contain +@@ -15857,8 +15923,6 @@ + pkgutil_help $MISSING_DEPENDENCY ;; + pkgadd) + pkgadd_help $MISSING_DEPENDENCY ;; +- * ) +- break ;; + esac + + if test "x$PKGHANDLER_COMMAND" != x; then +@@ -16037,7 +16101,7 @@ + JVM_ARG_OK=false + fi + +- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then ++ if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then + # Why does macosx need more heap? Its the huge JDK batch. + + $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5 +@@ -19109,6 +19173,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 +@@ -19246,8 +19313,6 @@ + pkgutil_help $MISSING_DEPENDENCY ;; + pkgadd) + pkgadd_help $MISSING_DEPENDENCY ;; +- * ) +- break ;; + esac + + if test "x$PKGHANDLER_COMMAND" != x; then +@@ -19523,9 +19588,12 @@ + $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;} + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5 ++ TEST_COMPILER="$CC" ++ # 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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5 + $as_echo_n "checking resolved symbolic links for CC... " >&6; } +- TEST_COMPILER="$CC" + + if test "x$OPENJDK_BUILD_OS" != xwindows; then + # Follow a chain of symbolic links. Use readlink +@@ -19574,8 +19642,9 @@ + fi + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5 + $as_echo "$TEST_COMPILER" >&6; } ++ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC is disguised ccache" >&5 + $as_echo_n "checking if CC is disguised ccache... " >&6; } + +@@ -20039,6 +20108,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 ++ as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5 ++ else ++ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-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 +@@ -20680,6 +20758,14 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ++ # 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 ++ ++ + ### Locate C++ compiler (CXX) + + if test "x$CXX" != x; then +@@ -20688,6 +20774,9 @@ + 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 +@@ -20825,8 +20914,6 @@ + pkgutil_help $MISSING_DEPENDENCY ;; + pkgadd) + pkgadd_help $MISSING_DEPENDENCY ;; +- * ) +- break ;; + esac + + if test "x$PKGHANDLER_COMMAND" != x; then +@@ -21102,9 +21189,12 @@ + $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;} + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5 ++ TEST_COMPILER="$CXX" ++ # 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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5 + $as_echo_n "checking resolved symbolic links for CXX... " >&6; } +- TEST_COMPILER="$CXX" + + if test "x$OPENJDK_BUILD_OS" != xwindows; then + # Follow a chain of symbolic links. Use readlink +@@ -21153,8 +21243,9 @@ + fi + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5 + $as_echo "$TEST_COMPILER" >&6; } ++ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CXX is disguised ccache" >&5 + $as_echo_n "checking if CXX is disguised ccache... " >&6; } + +@@ -21618,6 +21709,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 ++ as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5 ++ else ++ COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-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 +@@ -22823,6 +22923,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 +@@ -28798,16 +28900,17 @@ + # is made at runtime.) + # + +- if test "x$OPENJDK_TARGET_OS" = xsolaris; then +- # Always specify -m flags on Solaris ++ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then ++ # Always specify -m flag on Solaris ++ # And -q on AIX because otherwise the compiler produces 32-bit objects by default + + # When we add flags to the "official" CFLAGS etc, we need to + # keep track of these additions in ADDED_CFLAGS etc. These + # will later be checked to make sure only controlled additions + # have been made to CFLAGS etc. +- ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" +- ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" +- ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" + + CFLAGS="${CFLAGS}${ADDED_CFLAGS}" + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" +@@ -28825,9 +28928,9 @@ + # keep track of these additions in ADDED_CFLAGS etc. These + # will later be checked to make sure only controlled additions + # have been made to CFLAGS etc. +- ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" +- ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" +- ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" + + CFLAGS="${CFLAGS}${ADDED_CFLAGS}" + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" +@@ -28901,20 +29004,85 @@ + + + +- if test "x$SIZEOF_INT_P" != "x$ac_cv_sizeof_int_p"; then +- # Workaround autoconf bug, see http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html +- SIZEOF_INT_P="$ac_cv_sizeof_int_p" +- fi +- +- if test "x$SIZEOF_INT_P" = x; then ++ # AC_CHECK_SIZEOF defines 'ac_cv_sizeof_int_p' to hold the number of bytes used by an 'int*' ++ if test "x$ac_cv_sizeof_int_p" = x; then + # The test failed, lets stick to the assumed value. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&5 + $as_echo "$as_me: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&2;} + else +- TESTED_TARGET_CPU_BITS=`expr 8 \* $SIZEOF_INT_P` ++ TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p` + + if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then +- as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5 ++ # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects ++ # Let's try to implicitely set the compilers target architecture and retry the test ++ { $as_echo "$as_me:${as_lineno-$LINENO}: The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)." >&5 ++$as_echo "$as_me: The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)." >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" >&5 ++$as_echo "$as_me: I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" >&6;} ++ ++ # When we add flags to the "official" CFLAGS etc, we need to ++ # keep track of these additions in ADDED_CFLAGS etc. These ++ # will later be checked to make sure only controlled additions ++ # have been made to CFLAGS etc. ++ ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" ++ ++ CFLAGS="${CFLAGS}${ADDED_CFLAGS}" ++ CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" ++ LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" ++ ++ CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" ++ CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" ++ LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" ++ ++ ++ # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value! ++ unset ac_cv_sizeof_int_p ++ # And we have to undef the definition of SIZEOF_INT_P in confdefs.h by the previous invocation of AC_CHECK_SIZEOF ++ cat >>confdefs.h <<_ACEOF ++#undef SIZEOF_INT_P ++_ACEOF ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 ++$as_echo_n "checking size of int *... " >&6; } ++if ${ac_cv_sizeof_int_p+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : ++ ++else ++ if test "$ac_cv_type_int_p" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error 77 "cannot compute sizeof (int *) ++See \`config.log' for more details" "$LINENO" 5; } ++ else ++ ac_cv_sizeof_int_p=0 ++ fi ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5 ++$as_echo "$ac_cv_sizeof_int_p" >&6; } ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_INT_P $ac_cv_sizeof_int_p ++_ACEOF ++ ++ ++ ++ TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p` ++ ++ if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then ++ as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5 ++ fi + fi + fi + +@@ -29227,6 +29395,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 +@@ -29412,6 +29603,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 ) +@@ -29535,6 +29744,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 \ +@@ -29604,6 +29820,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 +@@ -29736,10 +29955,10 @@ + # 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 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"$ZERO_ARCHFLAG\"" >&5 +@@ -29808,15 +30027,15 @@ + + + +- # 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 + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"" >&5 +-$as_echo_n "checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"" >&5 ++$as_echo_n "checking if compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"... " >&6; } + supports=yes + + saved_cflags="$CFLAGS" +- CFLAGS="$CFLAGS -m${OPENJDK_TARGET_CPU_BITS}" ++ CFLAGS="$CFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -29842,7 +30061,7 @@ + CFLAGS="$saved_cflags" + + saved_cxxflags="$CXXFLAGS" +- CXXFLAGS="$CXXFLAG -m${OPENJDK_TARGET_CPU_BITS}" ++ CXXFLAGS="$CXXFLAG ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -29878,6 +30097,27 @@ + + + ++ # 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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken SuSE 'ld' which only understands anonymous version tags in executables" >&5 ++$as_echo_n "checking for broken SuSE 'ld' which only understands anonymous version tags in executables... " >&6; } ++ echo "SUNWprivate_1.1 { local: *; };" > version-script.map ++ echo "int main() { }" > main.c ++ if $CXX -Xlinker -version-script=version-script.map main.c 2>&5 >&5; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ USING_BROKEN_SUSE_LD=no ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ USING_BROKEN_SUSE_LD=yes ++ fi ++ rm -rf version-script.map main.c ++ fi ++ ++ ++ + # Setup debug symbols (need objcopy from the toolchain for that) + + # +@@ -30034,6 +30274,16 @@ + $as_echo "alsa pulse" >&6; } + fi + ++ if test "x$OPENJDK_TARGET_OS" = xaix; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on AIX?" >&5 ++$as_echo_n "checking what is not needed on AIX?... " >&6; } ++ ALSA_NOT_NEEDED=yes ++ PULSE_NOT_NEEDED=yes ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 ++$as_echo "alsa pulse" >&6; } ++ fi ++ ++ + if test "x$OPENJDK_TARGET_OS" = xwindows; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Windows?" >&5 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411090523.sA95NWMT062480>