update x32 patch based on debian patches

diff --git a/x32.patch b/x32.patch
index 03f58bac73c321ee7d5c332cf22c1fa6d1b82fa3..2d214dfb1d19386e44042d3ac933b30a5cc65784 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,82 +1,57 @@
-diff -urN jdk9u-jdk-9.0.4+12.orig/make/autoconf/flags.m4 jdk9u-jdk-9.0.4+12/make/autoconf/flags.m4
---- jdk9u-jdk-9.0.4+12.orig/make/autoconf/flags.m4     2017-12-20 00:25:20.000000000 +0100
-+++ jdk9u-jdk-9.0.4+12/make/autoconf/flags.m4  2020-08-29 23:58:39.603994302 +0200
-@@ -215,7 +215,10 @@
-     COMPILER_COMMAND_FILE_FLAG="-f"
-     COMPILER_BINDCMD_FILE_FLAG="-bloadmap:"
-   else
--    COMPILER_TARGET_BITS_FLAG="-m"
-+    case $CC in
-+      *x32-*) COMPILER_TARGET_BITS_FLAG="-mx";;
-+      *) COMPILER_TARGET_BITS_FLAG="-m"
-+    esac
-     COMPILER_COMMAND_FILE_FLAG="@"
-     COMPILER_BINDCMD_FILE_FLAG=""
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -1847,7 +1847,7 @@ void * os::dll_load(const char *filename
  
-diff -urN jdk9u-jdk-9.0.4+12.orig/make/autoconf/platform.m4 jdk9u-jdk-9.0.4+12/make/autoconf/platform.m4
---- jdk9u-jdk-9.0.4+12.orig/make/autoconf/platform.m4  2017-12-20 00:25:20.000000000 +0100
-+++ jdk9u-jdk-9.0.4+12/make/autoconf/platform.m4       2020-08-29 23:54:36.322300132 +0200
-@@ -31,10 +31,20 @@
-   # First argument is the cpu name from the trip/quad
-   case "$1" in
-     x86_64)
--      VAR_CPU=x86_64
--      VAR_CPU_ARCH=x86
--      VAR_CPU_BITS=64
--      VAR_CPU_ENDIAN=little
-+      case "$target_os" in
-+        *x32)
-+          VAR_CPU=x32
-+          VAR_CPU_ARCH=x86
-+          VAR_CPU_BITS=32
-+          VAR_CPU_ENDIAN=little
-+          ;;
-+        *)
-+          VAR_CPU=x86_64
-+          VAR_CPU_ARCH=x86
-+          VAR_CPU_BITS=64
-+          VAR_CPU_ENDIAN=little
-+          ;;
+ #if  (defined IA32)
+   static  Elf32_Half running_arch_code=EM_386;
+-#elif   (defined AMD64)
++#elif   (defined AMD64) || defined(X32)
+   static  Elf32_Half running_arch_code=EM_X86_64;
+ #elif  (defined IA64)
+   static  Elf32_Half running_arch_code=EM_IA_64;
+--- a/make/autoconf/platform.m4
++++ b/make/autoconf/platform.m4
+@@ -35,6 +35,10 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
+       VAR_CPU_ARCH=x86
+       VAR_CPU_BITS=64
+       VAR_CPU_ENDIAN=little
++      case "$host" in *x32)
++        VAR_CPU=x32
++        VAR_CPU_BITS=32
 +      esac
        ;;
      i?86)
        VAR_CPU=x86
-@@ -408,6 +418,14 @@
+@@ -455,6 +459,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HEL
      HOTSPOT_$1_CPU_DEFINE=IA32
    elif test "x$OPENJDK_$1_CPU" = xx86_64; then
      HOTSPOT_$1_CPU_DEFINE=AMD64
-+      case "$target_os" in
-+        *x32)
-+          HOTSPOT_$1_CPU_DEFINE=X32
-+          ;;
-+        *)
-+          HOTSPOT_$1_CPU_DEFINE=AMD64
-+          ;;
-+      esac
++  elif test "x$OPENJDK_$1_CPU" = xx32; then
++    HOTSPOT_$1_CPU_DEFINE=X32
    elif test "x$OPENJDK_$1_CPU" = xsparcv9; then
      HOTSPOT_$1_CPU_DEFINE=SPARC
    elif test "x$OPENJDK_$1_CPU" = xaarch64; then
-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
---- jdk9u-jdk-9.0.4+12.orig/src/hotspot/os/linux/os_linux.cpp  2020-08-29 23:50:35.510694441 +0200
-+++ jdk9u-jdk-9.0.4+12/src/hotspot/os/linux/os_linux.cpp       2020-08-29 23:55:07.785416515 +0200
-@@ -1770,7 +1770,7 @@
+--- a/make/autoconf/flags.m4
++++ b/make/autoconf/flags.m4
+@@ -254,6 +254,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
+         test "x$OPENJDK_TARGET_CPU_ARCH" = xppc; then
+       MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+     fi
++    case "$host" in *x32) MACHINE_FLAG=;; esac
+   fi
  
- #if  (defined IA32)
-   static  Elf32_Half running_arch_code=EM_386;
--#elif   (defined AMD64)
-+#elif   (defined AMD64) || (defined X32)
-   static  Elf32_Half running_arch_code=EM_X86_64;
- #elif  (defined IA64)
-   static  Elf32_Half running_arch_code=EM_IA_64;
-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
---- jdk9u-jdk-9.0.4+12.orig/src/jdk.pack/share/native/common-unpack/unpack.cpp 2018-01-13 03:07:38.000000000 +0100
-+++ jdk9u-jdk-9.0.4+12/src/jdk.pack/share/native/common-unpack/unpack.cpp      2020-08-29 23:59:35.900292250 +0200
-@@ -37,7 +37,7 @@
-  * Solaris compilers will define __sparcv9 or __x86_64 on 64bit compilations.
-  */
- #if !defined (_MSC_VER) && \
--    (defined(_LP64) || defined(__sparcv9) || defined(__x86_64))
-+    (defined(_LP64) || defined(__sparcv9) || defined(__x86_64) && !defined(__ILP32__))
-   #define LONG_LONG_FORMAT "%ld"
-   #define LONG_LONG_HEX_FORMAT "%lx"
- #else
+   # FIXME: global flags are not used yet...
+@@ -328,11 +329,8 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL]
+   AC_SUBST(COMPILER_COMMAND_FILE_FLAG)
+   AC_SUBST(COMPILER_BINDCMD_FILE_FLAG)
+ 
+-  # Check that the compiler supports -mX (or -qX on AIX) flags
+-  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
+-  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
+-      IF_TRUE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
+-      IF_FALSE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
++  # Don't run the -mX check and set this always to false, or else x32 gets passed -m32
++  COMPILER_SUPPORTS_TARGET_BITS_FLAG=false
+   AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
+ 
+   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then