openjdk team mailing list archive

[John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>]

Source: openjdk-10
Version: 10~46-2
Severity: normal
Tags: patch
User: debian-ia64@xxxxxxxxxxxxxxxx
Usertags: ia64

Hi!

The attached patch fixes OpenJDK-10 for ia64 (Zero). Please consider
applying it for the next upload.

Thanks,
Adrian

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@xxxxxxxxxx
`. `'   Freie Universitaet Berlin - glaubitz@xxxxxxxxxxxxxxxxxxx
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

diff -Nru old/openjdk-10-10~46/debian/patches/hotspot-ia64.diff new/openjdk-10-10~46/debian/patches/hotspot-ia64.diff
--- old/openjdk-10-10~46/debian/patches/hotspot-ia64.diff	1970-01-01 01:00:00.000000000 +0100
+++ new/openjdk-10-10~46/debian/patches/hotspot-ia64.diff	2018-03-26 02:41:36.451934089 +0200
@@ -0,0 +1,26 @@
+--- a/src/hotspot/share/runtime/os.cpp	2018-03-05 14:18:55.000000000 +0100
++++ b/src/hotspot/share/runtime/os.cpp	2018-03-26 02:26:44.607427867 +0200
+@@ -1145,7 +1145,7 @@
+ // if C stack is walkable beyond current frame. The check for fp() is not
+ // necessary on Sparc, but it's harmless.
+ bool os::is_first_C_frame(frame* fr) {
+-#if (defined(IA64) && !defined(AIX)) && !defined(_WIN32)
++#if (defined(IA64) && !defined(AIX)) && !defined(_WIN32) && !defined(LINUX)
+   // On IA64 we have to check if the callers bsp is still valid
+   // (i.e. within the register stack bounds).
+   // Notice: this only works for threads created by the VM and only if
+--- a/make/autoconf/platform.m4	2018-03-05 14:18:55.000000000 +0100
++++ b/make/autoconf/platform.m4	2018-03-26 02:28:39.067699053 +0200
+@@ -60,6 +60,12 @@
+       VAR_CPU_BITS=64
+       VAR_CPU_ENDIAN=little
+       ;;
++    ia64)
++      VAR_CPU=ia64
++      VAR_CPU_ARCH=ia64
++      VAR_CPU_BITS=64
++      VAR_CPU_ENDIAN=little
++      ;;
+     m68k)
+       VAR_CPU=m68k
+       VAR_CPU_ARCH=m68k
diff -Nru old/openjdk-10-10~46/debian/rules new/openjdk-10-10~46/debian/rules
--- old/openjdk-10-10~46/debian/rules	2018-03-15 14:31:57.000000000 +0100
+++ new/openjdk-10-10~46/debian/rules	2018-03-26 02:46:26.974332045 +0200
@@ -327,6 +327,7 @@
 	mips-sigset.diff \
 	disable-doclint-by-default.diff \
 	make-4.2-workaround.diff \
+	hotspot-ia64.diff \
 
 ifeq ($(derivative),Ubuntu)
   COMMON_PATCHES += \