# HG changeset patch
# User asaha
# Date 1397063572 25200
# Node ID 06b2c23e242d654c7c99cff7c9b5f1e1450859ec
# Parent  a214741db29f80578104dbdb69c9db166ae8d025# Parent  d8ff32aa51b414c30b590e7d370aaafac64cd769
Merge

diff -r a214741db29f -r 06b2c23e242d .hgtags
--- a/.hgtags	Wed Apr 02 10:33:23 2014 -0700
+++ b/.hgtags	Wed Apr 09 10:12:52 2014 -0700
@@ -281,3 +281,4 @@
 ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
 6403ef94cb0db32d9221a5e8f09f3664cd7744dc jdk8u20-b07
 b7750b6ee1578fd5b2b1f6758f905b332503d8ed jdk8u20-b08
+d420eae635c42be98b166e1ce9c64fc0a8825529 jdk8u20-b09
diff -r a214741db29f -r 06b2c23e242d common/autoconf/build-aux/config.guess
--- a/common/autoconf/build-aux/config.guess	Wed Apr 02 10:33:23 2014 -0700
+++ b/common/autoconf/build-aux/config.guess	Wed Apr 09 10:12:52 2014 -0700
@@ -76,4 +76,14 @@
   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 -r a214741db29f -r 06b2c23e242d common/autoconf/platform.m4
--- a/common/autoconf/platform.m4	Wed Apr 02 10:33:23 2014 -0700
+++ b/common/autoconf/platform.m4	Wed Apr 09 10:12:52 2014 -0700
@@ -60,6 +60,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
diff -r a214741db29f -r 06b2c23e242d make/Jprt.gmk
--- a/make/Jprt.gmk	Wed Apr 02 10:33:23 2014 -0700
+++ b/make/Jprt.gmk	Wed Apr 09 10:12:52 2014 -0700
@@ -106,6 +106,9 @@
         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