Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171328407878190"
MIME-Version: 1.0
Date: Tue, 16 Apr 2024 16:14:38 +0000
From: "Izumi Tsutsui" <tsutsui@netbsd.org>
Subject: CVS commit: pkgsrc/lang/openjdk17
To: pkgsrc-changes@NetBSD.org
Reply-To: tsutsui@netbsd.org
Message-Id: <20240416161438.8D858FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171328407878190
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tsutsui
Date:		Tue Apr 16 16:14:38 UTC 2024

Modified Files:
	pkgsrc/lang/openjdk17: distinfo
Added Files:
	pkgsrc/lang/openjdk17/patches:
	    patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp

Log Message:
openjdk17: fix build errors on NetBSD/i386 10.0.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171328407878190
Content-Disposition: inline
Content-Length: 2962
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.17 pkgsrc/lang/openjdk17/distinfo:1.18
--- pkgsrc/lang/openjdk17/distinfo:1.17	Mon Mar 18 15:25:48 2024
+++ pkgsrc/lang/openjdk17/distinfo	Tue Apr 16 16:14:38 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2024/03/18 15:25:48 ryoon Exp $
+$NetBSD: distinfo,v 1.18 2024/04/16 16:14:38 tsutsui Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = b632092d25292e795a2d7567ec55d03f21021dbba27eab3e81a48aed5e5bdd68
 SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = fb86749d56be94cc1509f92d8fbdec481b0c7f6fdd5e731826098e6eaa668539052571ffd09125346c1920262b07857ea675799ab8476fcff53c03e158536c1d
@@ -25,5 +25,6 @@ SHA1 (patch-make_autoconf_lib-freetype.m
 SHA1 (patch-make_autoconf_lib-x11.m4) = 38038e6d7cfc2d15fb3537a52f11d2961cc2ec99
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 3172d8d76e0e79b127605429fb70dccd164b33c8
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = d69fa8c5cab173be2f41cfbd6479dad60a6337db
+SHA1 (patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp) = 7cdc5a746ab26df5b2be98b0d254e6018dc96fda
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 5561ed502aa925cd3d0514c7ec298e0491d14ffc
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = d7bd8839ecd84459fbd3e7d14ac0e2f48b8b4032

Added files:

Index: pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp
diff -u /dev/null pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp:1.1
--- /dev/null	Tue Apr 16 16:14:38 2024
+++ pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp	Tue Apr 16 16:14:38 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp,v 1.1 2024/04/16 16:14:38 tsutsui Exp $
+
+- Fix a build error on NetBSD/i386 10.0, per old upstream implementation:
+ https://github.com/battleblow/jdk17u/commit/fb74640#diff-8c61a4cafafa5e629be7eac3205bb72dba3b53e720bd5052ed72c66bbe79e71c
+
+> src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp:288:37: error: attributes are not allowed on a function-definition
+>   288 | address os::current_stack_pointer() __attribute__ ((optnone)) {
+>       |                                     ^~~~~~~~~~~~~
+
+--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp.orig	2024-02-04 02:18:56.000000000 +0000
++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+@@ -285,11 +285,18 @@ address os::current_stack_pointer() {
+   return (address)__builtin_frame_address(0);
+ }
+ #else
++#if defined(__clang__) || defined(__llvm__)
+ address os::current_stack_pointer() __attribute__ ((optnone)) {
+   intptr_t* esp;
+   __asm__ __volatile__ ("mov %%" SPELL_REG_SP ", %0":"=r"(esp):);
+   return (address) esp;
+ }
++#else
++address os::current_stack_pointer() {
++  register void *esp __asm__ (SPELL_REG_SP);
++  return (address) esp;
++}
++#endif
+ #endif
+ 
+ char* os::non_memory_address_word() {


--_----------=_171328407878190--