1 |
# HG changeset patch |
2 |
# User andrew |
3 |
# Date 1424102734 0 |
4 |
# Mon Feb 16 16:05:34 2015 +0000 |
5 |
# Node ID 4fdaf786d977aa77afdb68b8829579d31069e39c |
6 |
# Parent 01a0011cc101f3308c5876db8282c0fc5e3ba2e6 |
7 |
PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it |
8 |
Summary: Use ppc64le as the arch directory on that platform and report it in os.arch |
9 |
|
10 |
--- openjdk/hotspot/make/defs.make.orig 2015-03-03 17:05:51.000000000 -0500 |
11 |
+++ openjdk/hotspot/make/defs.make 2015-03-03 19:18:20.000000000 -0500 |
12 |
@@ -319,6 +319,13 @@ |
13 |
LIBARCH/arm = arm |
14 |
LIBARCH/zero = $(ZERO_LIBARCH) |
15 |
|
16 |
+ # Override LIBARCH for ppc64le |
17 |
+ ifeq ($(ARCH), ppc64) |
18 |
+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little) |
19 |
+ LIBARCH = ppc64le |
20 |
+ endif |
21 |
+ endif |
22 |
+ |
23 |
LP64_ARCH = sparcv9 amd64 ppc64 aarch64 ia64 zero |
24 |
endif |
25 |
|
26 |
diff -r 01a0011cc101 -r 4fdaf786d977 src/os/linux/vm/os_linux.cpp |
27 |
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Feb 16 13:18:10 2015 +0000 |
28 |
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Feb 16 16:05:34 2015 +0000 |
29 |
@@ -305,7 +305,11 @@ |
30 |
#elif defined(PPC32) |
31 |
static char cpu_arch[] = "ppc"; |
32 |
#elif defined(PPC64) |
33 |
+#if defined(VM_LITTLE_ENDIAN) |
34 |
+static char cpu_arch[] = "ppc64le"; |
35 |
+#else |
36 |
static char cpu_arch[] = "ppc64"; |
37 |
+#endif |
38 |
#elif defined(SPARC) |
39 |
# ifdef _LP64 |
40 |
static char cpu_arch[] = "sparcv9"; |