]>
Commit | Line | Data |
---|---|---|
f985347b | 1 | diff -dur -x '*~' openjdk.orig/common/autoconf/platform.m4 openjdk/common/autoconf/platform.m4 |
19f47772 | 2 | --- openjdk.orig/common/autoconf/platform.m4 2016-07-25 07:38:20.000000000 +0200 |
762736f4 | 3 | +++ openjdk/common/autoconf/platform.m4 2016-09-21 09:03:56.589063655 +0200 |
19f47772 JK |
4 | @@ -36,6 +36,12 @@ |
5 | VAR_CPU_BITS=64 | |
6 | VAR_CPU_ENDIAN=little | |
7 | ;; | |
8 | + x32) | |
f985347b | 9 | + VAR_CPU=x32 |
19f47772 JK |
10 | + VAR_CPU_ARCH=x86 |
11 | + VAR_CPU_BITS=32 | |
12 | + VAR_CPU_ENDIAN=little | |
13 | + ;; | |
14 | i?86) | |
15 | VAR_CPU=x86 | |
16 | VAR_CPU_ARCH=x86 | |
f985347b JK |
17 | @@ -168,7 +174,7 @@ |
18 | ||
19 | # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. | |
20 | PLATFORM_EXTRACT_VARS_FROM_OS($build_os) | |
21 | - PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu) | |
22 | + PLATFORM_EXTRACT_VARS_FROM_CPU(x32) | |
23 | # ..and setup our own variables. (Do this explicitely to facilitate searching) | |
24 | OPENJDK_BUILD_OS="$VAR_OS" | |
25 | OPENJDK_BUILD_OS_API="$VAR_OS_API" | |
26 | @@ -193,7 +199,7 @@ | |
27 | ||
28 | # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. | |
29 | PLATFORM_EXTRACT_VARS_FROM_OS($host_os) | |
30 | - PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu) | |
31 | + PLATFORM_EXTRACT_VARS_FROM_CPU(x32) | |
32 | # ... and setup our own variables. (Do this explicitely to facilitate searching) | |
33 | OPENJDK_TARGET_OS="$VAR_OS" | |
34 | OPENJDK_TARGET_OS_API="$VAR_OS_API" | |
35 | @@ -383,6 +389,7 @@ | |
36 | ppc64) ZERO_ARCHDEF=PPC64 ;; | |
37 | s390*) ZERO_ARCHDEF=S390 ;; | |
38 | sparc*) ZERO_ARCHDEF=SPARC ;; | |
39 | + x32*) ZERO_ARCHDEF=X32 ;; | |
40 | x86_64*) ZERO_ARCHDEF=AMD64 ;; | |
41 | x86) ZERO_ARCHDEF=IA32 ;; | |
42 | *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z) | |
2c9e946f AM |
43 | --- openjdk/common/autoconf/flags.m4~ 2019-04-18 04:46:13.000000000 +0200 |
44 | +++ openjdk/common/autoconf/flags.m4 2019-05-21 09:04:04.356004924 +0200 | |
45 | @@ -482,6 +482,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAG | |
46 | ppc ) | |
47 | # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing | |
48 | ;; | |
49 | + x32 ) | |
50 | + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer -DX32" | |
51 | + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" | |
52 | + ;; | |
53 | x86 ) | |
54 | CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" | |
55 | CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" | |
f985347b JK |
56 | diff -dur -x '*~' openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp |
57 | --- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2016-09-20 13:22:05.697032126 +0200 | |
762736f4 | 58 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2016-09-21 09:03:56.592397163 +0200 |
19f47772 | 59 | @@ -1911,7 +1911,7 @@ |
ef4429ab JR |
60 | |
61 | #if (defined IA32) | |
62 | static Elf32_Half running_arch_code=EM_386; | |
63 | - #elif (defined AMD64) | |
64 | + #elif (defined AMD64) || (defined X32) | |
65 | static Elf32_Half running_arch_code=EM_X86_64; | |
66 | #elif (defined IA64) | |
67 | static Elf32_Half running_arch_code=EM_IA_64; | |
f985347b | 68 | diff -dur -x '*~' openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.hpp openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp |
19f47772 | 69 | --- openjdk.orig/hotspot/src/share/vm/utilities/taskqueue.hpp 2016-07-25 07:38:24.000000000 +0200 |
762736f4 | 70 | +++ openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp 2016-09-21 09:03:56.592397163 +0200 |
19f47772 JK |
71 | @@ -400,7 +400,7 @@ |
72 | // Architectures with weak memory model require a barrier here | |
73 | // to guarantee that bottom is not older than age, | |
74 | // which is crucial for the correctness of the algorithm. | |
75 | -#if !(defined SPARC || defined IA32 || defined AMD64) | |
76 | +#if !(defined SPARC || defined IA32 || defined AMD64 || defined X32) | |
77 | OrderAccess::fence(); | |
78 | #endif | |
79 | uint localBot = OrderAccess::load_acquire((volatile juint*)&_bottom); | |
762736f4 JK |
80 | diff -dur -x '*~' openjdk.orig/jdk/make/gensrc/GensrcX11Wrappers.gmk openjdk/jdk/make/gensrc/GensrcX11Wrappers.gmk |
81 | --- openjdk.orig/jdk/make/gensrc/GensrcX11Wrappers.gmk 2016-07-25 07:38:26.000000000 +0200 | |
82 | +++ openjdk/jdk/make/gensrc/GensrcX11Wrappers.gmk 2016-09-21 09:12:46.033398082 +0200 | |
83 | @@ -86,10 +86,7 @@ | |
84 | $(MKDIR) -p $(@D) | |
85 | $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $* | |
86 | ||
87 | - # use -m32/-m64 only if the compiler supports it | |
88 | - ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true) | |
89 | - MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*" | |
90 | - endif | |
91 | + MEMORY_MODEL_FLAG="-mx32" | |
92 | ||
93 | # Compile the C code into an executable. | |
94 | $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c | |
f985347b | 95 | diff -dur -x '*~' openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c |
19f47772 | 96 | --- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2016-07-25 07:38:26.000000000 +0200 |
762736f4 | 97 | +++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2016-09-21 09:03:56.592397163 +0200 |
19f47772 | 98 | @@ -41,7 +41,6 @@ |
f1360ca9 JK |
99 | #endif |
100 | #ifdef __linux__ | |
101 | #include <unistd.h> | |
102 | -#include <sys/sysctl.h> | |
103 | #include <sys/utsname.h> | |
104 | #include <netinet/ip.h> | |
105 | ||
f985347b | 106 | diff -dur -x '*~' openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
19f47772 | 107 | --- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2016-07-25 07:38:26.000000000 +0200 |
762736f4 | 108 | +++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2016-09-21 09:03:56.595730671 +0200 |
f1360ca9 JK |
109 | @@ -43,7 +43,6 @@ |
110 | #endif | |
111 | #ifdef __linux__ | |
112 | #include <unistd.h> | |
113 | -#include <sys/sysctl.h> | |
114 | #endif | |
115 | ||
116 | #include "jvm.h" |