diff options
| author | amurillo <none@none> | 2014-04-08 09:59:09 -0700 |
|---|---|---|
| committer | amurillo <none@none> | 2014-04-08 09:59:09 -0700 |
| commit | 8974a8e897e0dec04eaff28a50019564108b58cf (patch) | |
| tree | e2e2ee950b1989aa6ad36e8994ef373dc58554a9 | |
| parent | f6b778eaefb18cd69e3e5af9b7984399940236b5 (diff) | |
| parent | 1042c9e6f98e668b0d3c167a2138a19fbafd23cb (diff) | |
Mergejdk8u20-b09
| -rw-r--r-- | common/autoconf/build-aux/config.guess | 10 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 14 | ||||
| -rw-r--r-- | common/autoconf/platform.m4 | 6 |
3 files changed, 29 insertions, 1 deletions
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/generated-configure.sh b/common/autoconf/generated-configure.sh index fc41d34..5ea038a 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3868,7 +3868,7 @@ fi #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 @@ test -n "$target_alias" && 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 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; } 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/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 |