attempt to fix x32 build

[packages/openjdk9.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 266061f3310ba050b74b6573aeb1326011ecd033..34fdef3efd19185988ad9d213f6de5702ed8fc81 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -105,14 +105,15 @@ diff -durN jdk8u-jdk8u66-b02.orig/jdk/src/solaris/native/java/net/PlainSocketImp
      *)      COMPILER_TARGET_BITS_FLAG="-m";;
    esac
 
---- jdk8u-jdk8u66-b02.orig/hotspot/src/cpu/zero/vm/frame_zero.cpp      2015-07-22 19:12:56.000000000 +0200
-+++ jdk8u-jdk8u66-b02/hotspot/src/cpu/zero/vm/frame_zero.cpp   2015-09-21 15:28:59.680331993 +0200
-@@ -216,7 +216,7 @@
-     valuebuf[buflen - 1] = '\0';
- 
-     // Print the result
--    st->print_cr(" " PTR_FORMAT ": %-21s = %s", addr, fieldbuf, valuebuf);
-+    st->print_cr(" " PTR_FORMAT ": %-21s = %s", (uintptr_t)addr, fieldbuf, valuebuf);
-   }
- }
- 
+
+--- jdk8u-jdk8u92-b31/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.orig  2016-07-29 15:08:03.457784497 +0200
++++ jdk8u-jdk8u92-b31/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp       2016-07-29 15:10:09.380999329 +0200
+@@ -34,7 +34,7 @@
+  * _LP64 can be explicitly set (used on Linux).
+  * Solaris compilers will define __sparcv9 or __x86_64 on 64bit compilations.
+  */
+-#if defined(_LP64) || defined(__sparcv9) || defined(__x86_64)
++#if defined(_LP64) || defined(__sparcv9) || (defined(__x86_64) && !defined(__ILP32__))
+   #define LONG_LONG_FORMAT "%ld"
+   #define LONG_LONG_HEX_FORMAT "%lx"
+ #else