1 diff -urN jdk9u-jdk-9.0.4+12.orig/make/autoconf/flags.m4 jdk9u-jdk-9.0.4+12/make/autoconf/flags.m4
2 --- jdk9u-jdk-9.0.4+12.orig/make/autoconf/flags.m4 2017-12-20 00:25:20.000000000 +0100
3 +++ jdk9u-jdk-9.0.4+12/make/autoconf/flags.m4 2020-08-29 23:58:39.603994302 +0200
5 COMPILER_COMMAND_FILE_FLAG="-f"
6 COMPILER_BINDCMD_FILE_FLAG="-bloadmap:"
8 - COMPILER_TARGET_BITS_FLAG="-m"
10 + *x32-*) COMPILER_TARGET_BITS_FLAG="-mx";;
11 + *) COMPILER_TARGET_BITS_FLAG="-m"
13 COMPILER_COMMAND_FILE_FLAG="@"
14 COMPILER_BINDCMD_FILE_FLAG=""
16 diff -urN jdk9u-jdk-9.0.4+12.orig/make/autoconf/platform.m4 jdk9u-jdk-9.0.4+12/make/autoconf/platform.m4
17 --- jdk9u-jdk-9.0.4+12.orig/make/autoconf/platform.m4 2017-12-20 00:25:20.000000000 +0100
18 +++ jdk9u-jdk-9.0.4+12/make/autoconf/platform.m4 2020-08-29 23:54:36.322300132 +0200
20 # First argument is the cpu name from the trip/quad
26 - VAR_CPU_ENDIAN=little
27 + case "$target_os" in
32 + VAR_CPU_ENDIAN=little
38 + VAR_CPU_ENDIAN=little
45 HOTSPOT_$1_CPU_DEFINE=IA32
46 elif test "x$OPENJDK_$1_CPU" = xx86_64; then
47 HOTSPOT_$1_CPU_DEFINE=AMD64
48 + case "$target_os" in
50 + HOTSPOT_$1_CPU_DEFINE=X32
53 + HOTSPOT_$1_CPU_DEFINE=AMD64
56 elif test "x$OPENJDK_$1_CPU" = xsparcv9; then
57 HOTSPOT_$1_CPU_DEFINE=SPARC
58 elif test "x$OPENJDK_$1_CPU" = xaarch64; then
59 diff -urN jdk9u-jdk-9.0.4+12.orig/src/hotspot/os/linux/os_linux.cpp jdk9u-jdk-9.0.4+12/src/hotspot/os/linux/os_linux.cpp
60 --- jdk9u-jdk-9.0.4+12.orig/src/hotspot/os/linux/os_linux.cpp 2020-08-29 23:50:35.510694441 +0200
61 +++ jdk9u-jdk-9.0.4+12/src/hotspot/os/linux/os_linux.cpp 2020-08-29 23:55:07.785416515 +0200
65 static Elf32_Half running_arch_code=EM_386;
66 -#elif (defined AMD64)
67 +#elif (defined AMD64) || (defined X32)
68 static Elf32_Half running_arch_code=EM_X86_64;
70 static Elf32_Half running_arch_code=EM_IA_64;
71 diff -urN jdk9u-jdk-9.0.4+12.orig/src/jdk.pack/share/native/common-unpack/unpack.cpp jdk9u-jdk-9.0.4+12/src/jdk.pack/share/native/common-unpack/unpack.cpp
72 --- jdk9u-jdk-9.0.4+12.orig/src/jdk.pack/share/native/common-unpack/unpack.cpp 2018-01-13 03:07:38.000000000 +0100
73 +++ jdk9u-jdk-9.0.4+12/src/jdk.pack/share/native/common-unpack/unpack.cpp 2020-08-29 23:59:35.900292250 +0200
75 * Solaris compilers will define __sparcv9 or __x86_64 on 64bit compilations.
77 #if !defined (_MSC_VER) && \
78 - (defined(_LP64) || defined(__sparcv9) || defined(__x86_64))
79 + (defined(_LP64) || defined(__sparcv9) || defined(__x86_64) && !defined(__ILP32__))
80 #define LONG_LONG_FORMAT "%ld"
81 #define LONG_LONG_HEX_FORMAT "%lx"