diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | common/autoconf/build-aux/config.guess | 10 | ||||
| -rw-r--r-- | common/autoconf/platform.m4 | 6 | ||||
| -rw-r--r-- | make/Jprt.gmk | 3 |
4 files changed, 20 insertions, 0 deletions
@@ -281,3 +281,4 @@ cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02 ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06 6403ef94cb0db32d9221a5e8f09f3664cd7744dc jdk8u20-b07 b7750b6ee1578fd5b2b1f6758f905b332503d8ed jdk8u20-b08 +d420eae635c42be98b166e1ce9c64fc0a8825529 jdk8u20-b09 diff --git a/common/autoconf/build-aux/config.guess b/common/autoconf/build-aux/config.guess index b0c03a7..355c91e 100644 --- a/common/autoconf/build-aux/config.guess +++ b/common/autoconf/build-aux/config.guess @@ -76,4 +76,14 @@ if test $? = 0; then 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 diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index d1b1573..1f06f0c 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -60,6 +60,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU], 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 diff --git a/make/Jprt.gmk b/make/Jprt.gmk index 0075adc..c40e852 100644 --- a/make/Jprt.gmk +++ b/make/Jprt.gmk @@ -106,6 +106,9 @@ $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC ifdef ENABLE_SJAVAC @$(ECHO) " --enable-sjavac" >> $@.tmp endif + ifdef JDK_UPDATE_VERSION + @$(ECHO) " --with-update-version=$(JDK_UPDATE_VERSION)" >> $@.tmp + endif ifeq ($(HOTSPOT_AVAILABLE),false) ifdef ALT_JDK_IMPORT_PATH @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp |