openjdk team mailing list archive

[John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>]

Source: openjdk-9
Version: 9.0.4+12-2
Severity: normal
Tags: patch
User: debian-ia64@xxxxxxxxxxxxxxxx
Usertags: ia64

Hi!

The attached patch contains changes to the openjdk-9 package which
make the package build on ia64. Please apply. I will upstream the
changes as well and provide patches for the openjdk-10 and openjdk-11
packages in Debian.

I have cross-compiled openjdk-9 for ia64 with the patches applied and
just uploaded it to the Debian Ports FTP archive.

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-9-9.0.4+12/debian/patches/ia64-zero.diff new/openjdk-9-9.0.4+12/debian/patches/ia64-zero.diff
--- old/openjdk-9-9.0.4+12/debian/patches/ia64-zero.diff	1970-01-01 01:00:00.000000000 +0100
+++ new/openjdk-9-9.0.4+12/debian/patches/ia64-zero.diff	2018-03-25 09:48:18.872892026 +0200
@@ -0,0 +1,11 @@
+--- a/hotspot/src/share/vm/runtime/os.cpp	2018-01-22 16:19:02.000000000 +0100
++++ b/hotspot/src/share/vm/runtime/os.cpp	2018-03-25 05:03:41.005419666 +0200
+@@ -1075,7 +1075,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
diff -Nru old/openjdk-9-9.0.4+12/debian/patches/zero-architectures.diff new/openjdk-9-9.0.4+12/debian/patches/zero-architectures.diff
--- old/openjdk-9-9.0.4+12/debian/patches/zero-architectures.diff	2017-02-26 19:03:10.000000000 +0100
+++ new/openjdk-9-9.0.4+12/debian/patches/zero-architectures.diff	2018-03-25 09:49:29.247513632 +0200
@@ -17,7 +17,7 @@
      arm*)
        VAR_CPU=arm
        VAR_CPU_ARCH=arm
-@@ -54,6 +60,48 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
+@@ -54,6 +60,54 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
        VAR_CPU_BITS=64
        VAR_CPU_ENDIAN=little
        ;;
@@ -63,6 +63,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
++      ;;
      powerpc)
        VAR_CPU=ppc
        VAR_CPU_ARCH=ppc
diff -Nru old/openjdk-9-9.0.4+12/debian/rules new/openjdk-9-9.0.4+12/debian/rules
--- old/openjdk-9-9.0.4+12/debian/rules	2018-03-16 11:25:51.000000000 +0100
+++ new/openjdk-9-9.0.4+12/debian/rules	2018-03-25 10:33:54.814132453 +0200
@@ -344,6 +344,7 @@
 	disable-doclint-by-default.diff \
 	hotspot-fix-alpha-orderaccess.diff \
 	make-4.2-workaround.diff \
+	ia64-zero.diff \
 
 ifeq ($(derivative),Ubuntu)
   COMMON_PATCHES += \