diff options
| author | asaha <none@none> | 2014-04-10 15:25:51 -0700 |
|---|---|---|
| committer | asaha <none@none> | 2014-04-10 15:25:51 -0700 |
| commit | 7d9b214cde4d3cd2739e5dee21f216900cda8ff8 (patch) | |
| tree | 526f61d00de4e3e045a312354a85ec9e4fc6b1a3 | |
| parent | 47e078742e61c87dc818d9edca75cbb0271bdaca (diff) | |
8038655: Resolve autoconf merge issue of 8u5 and 8u20jdk8u20-b10
Reviewed-by: katleman
| -rw-r--r-- | common/autoconf/generated-configure.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 26ccce2..0da1410 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=1396458209 +DATE_WHEN_GENERATED=1397150809 ############################################################################### # @@ -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 |