1 |
diff -r 59d5dc6a0d95 common/autoconf/hotspot-spec.gmk.in |
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in |
2 |
--- openjdk///common/autoconf/hotspot-spec.gmk.in Wed May 25 13:42:38 2016 +0100 |
--- openjdk///common/autoconf/hotspot-spec.gmk.in |
3 |
+++ openjdk///common/autoconf/hotspot-spec.gmk.in Thu May 26 04:43:57 2016 +0100 |
+++ openjdk///common/autoconf/hotspot-spec.gmk.in |
4 |
@@ -71,6 +71,10 @@ |
@@ -71,6 +71,10 @@ |
5 |
LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB) |
LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB) |
6 |
# Set the cpu architecture |
# Set the cpu architecture |
12 |
# Legacy setting for building for a 64 bit machine. |
# Legacy setting for building for a 64 bit machine. |
13 |
# If yes then this expands to _LP64:=1 |
# If yes then this expands to _LP64:=1 |
14 |
@LP64@ |
@LP64@ |
15 |
diff -r 59d5dc6a0d95 common/autoconf/jdk-options.m4 |
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 |
16 |
--- openjdk///common/autoconf/jdk-options.m4 Wed May 25 13:42:38 2016 +0100 |
--- openjdk///common/autoconf/jdk-options.m4 |
17 |
+++ openjdk///common/autoconf/jdk-options.m4 Thu May 26 04:43:57 2016 +0100 |
+++ openjdk///common/autoconf/jdk-options.m4 |
18 |
@@ -158,7 +158,7 @@ |
@@ -158,7 +158,7 @@ |
19 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then |
20 |
INCLUDE_SA=false |
INCLUDE_SA=false |
24 |
INCLUDE_SA=false |
INCLUDE_SA=false |
25 |
fi |
fi |
26 |
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then |
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then |
27 |
diff -r 59d5dc6a0d95 common/autoconf/platform.m4 |
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 |
28 |
--- openjdk///common/autoconf/platform.m4 Wed May 25 13:42:38 2016 +0100 |
--- openjdk///common/autoconf/platform.m4 |
29 |
+++ openjdk///common/autoconf/platform.m4 Thu May 26 04:43:57 2016 +0100 |
+++ openjdk///common/autoconf/platform.m4 |
30 |
@@ -67,7 +67,7 @@ |
@@ -67,7 +67,7 @@ |
31 |
VAR_CPU_ENDIAN=big |
VAR_CPU_ENDIAN=big |
32 |
;; |
;; |
36 |
VAR_CPU_ARCH=ppc |
VAR_CPU_ARCH=ppc |
37 |
VAR_CPU_BITS=64 |
VAR_CPU_BITS=64 |
38 |
VAR_CPU_ENDIAN=little |
VAR_CPU_ENDIAN=little |
39 |
diff -r 59d5dc6a0d95 common/autoconf/toolchain.m4 |
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 |
40 |
--- openjdk///common/autoconf/toolchain.m4 Wed May 25 13:42:38 2016 +0100 |
--- openjdk///common/autoconf/toolchain.m4 |
41 |
+++ openjdk///common/autoconf/toolchain.m4 Thu May 26 04:43:57 2016 +0100 |
+++ openjdk///common/autoconf/toolchain.m4 |
42 |
@@ -1056,6 +1056,9 @@ |
@@ -1123,6 +1123,9 @@ |
43 |
else |
else |
44 |
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" |
45 |
fi |
fi |
46 |
+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then |
+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then |
47 |
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2" |
48 |
+ fi |
+ fi |
49 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
50 |
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" |
51 |
fi |
fi |