changeset 988:d420eae635c4 jdk8u20-b09

Merge
author amurillo
date Tue, 08 Apr 2014 09:59:09 -0700
parents 70b4b4c2fc44 (current diff) d832d813d65b (diff)
children d8ff32aa51b4
files
diffstat 3 files changed, 29 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/build-aux/config.guess	Thu Apr 03 10:31:36 2014 -0700
+++ b/common/autoconf/build-aux/config.guess	Tue Apr 08 09:59:09 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
--- a/common/autoconf/generated-configure.sh	Thu Apr 03 10:31:36 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Apr 08 09:59:09 2014 -0700
@@ -3868,7 +3868,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1395790635
+DATE_WHEN_GENERATED=1396481093
 
 ###############################################################################
 #
@@ -6830,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
@@ -6955,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
--- a/common/autoconf/platform.m4	Thu Apr 03 10:31:36 2014 -0700
+++ b/common/autoconf/platform.m4	Tue Apr 08 09:59:09 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