From nobody Thu Jan 26 06:51:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2WZn1zLxz3bldm; Thu, 26 Jan 2023 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2WZn1SBrz3sJV; Thu, 26 Jan 2023 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674715889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p74KRWtQYORqLGNRWz+IHSQ+5cRhQBtuxGTfhG2cC0s=; b=GgcSAyCYA0yiRN+GpH7ozcrCsZHeR3ak1n4n21pzjtbzXvSCr/VHsgkFda+vW+Nx6Cw6Gv P4h91mUErcBuwMXUInNQ4Aoj48uyNPGqDPl41GKB6CNFmLg3vvD2B4by4PJ84Up5mZ6zPM WlP6ThjtADe8W1TACVAsbPdGjIhh9zPgK+97JkWA3jWVsfmbZ4dpirf4ZcfLg7zje3aUE/ 0/36+RED06kl2ykhAfNKI8JoDS4IctNWDMow3ebmUDdxFpGFSCaFkB8c+6MXMSLfLCHG9q AWZeMjSb2zdY6vZdPqiOMcvp951CCngNRXh8aOyh/kUjbNxB4EvAKIRd/EUP1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674715889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p74KRWtQYORqLGNRWz+IHSQ+5cRhQBtuxGTfhG2cC0s=; b=w06SQSEu24zw6EZdqTF6fUSo64Xx20JfpT5jWqPGBh9bvbFOjtl9PnqxcJYba3U/4ofMOA gvv+NLgBxh4vCW+samwfS3Ic2G3mSc7AkIaHNM8yxZkiof6x0ZyR2SS4n/RCTC10iCSMIN ur7sQI/HkeBtY6fvnr3JCjF6WJqxdPh5/CW/MkhilFf/12HpJtoNnLEbmwx6uIlruWFGwT Rc6r2Y/0WWtMGL97YQy35d/aGzAlR7DBfB/Bt4E03qVG5nFfKpzuy6rLkeBOU3ZCgxd1Bl iRM518PDpKSs9AjUrDGRAoVcvFIO/Z1IO4QkyZsWjwHR2f9c7hiklKOA7rT+Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674715889; a=rsa-sha256; cv=none; b=Z6ZXi0WBYoSohgACccQRBDxXkYcSKOWfKhwVtn9U2LOHclw2QeJ2WZU+BjYuuIF5T5dnp/ 7/QkBycdoOxjodvXTcMNSxkH6IhDii09Y7dKBL5656eBl5M4/FNr5NgYZAMynt4tlao+lV /R0cyNziV6oUpOgmx/Wb9z7jEZ8qma3GKI9TPoG7+bcofJehpklQBc8wkg0z5kNl+Ma21x 77HAeA93KYPt9YHDSJXYSa/R9zaEgvSIOjkReZ0oPjvU2geO9yoJJUepUXNUcl23ZGLkvx oZxpwxEdUcNy/9IxNJ8iZYUNb7ktZ+7LK/sqN3fPhR5aGwAG50aOXHz/rlwq8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2WZn0VmrzKkQ; Thu, 26 Jan 2023 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30Q6pSLU005972; Thu, 26 Jan 2023 06:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30Q6pSM2005971; Thu, 26 Jan 2023 06:51:28 GMT (envelope-from git) Date: Thu, 26 Jan 2023 06:51:28 GMT Message-Id: <202301260651.30Q6pSM2005971@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 8c49e908cf33 - main - java/openjdk19: Fix the build on x86 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c49e908cf3339870f612b555b6054d10d0e9e7c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c49e908cf3339870f612b555b6054d10d0e9e7c commit 8c49e908cf3339870f612b555b6054d10d0e9e7c Author: Greg Lewis AuthorDate: 2023-01-26 06:50:17 +0000 Commit: Greg Lewis CommitDate: 2023-01-26 06:51:23 +0000 java/openjdk19: Fix the build on x86 --- ...agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp b/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp new file mode 100644 index 000000000000..30a55e7d9a9e --- /dev/null +++ b/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp @@ -0,0 +1,42 @@ +--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2022-10-20 06:58:23.018695000 -0700 ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2022-12-29 13:13:27.000625000 -0800 +@@ -35,7 +35,11 @@ + #define amd64 1 + #endif + +-#ifdef i386 ++#if defined(i386) && !defined(i586) ++#define i586 1 ++#endif ++ ++#ifdef i586 + #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" + #endif + +@@ -347,7 +351,7 @@ + } + + #undef NPRGREG +-#ifdef i386 ++#ifdef i586 + #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG + #endif + #ifdef amd64 +@@ -369,7 +373,7 @@ + + #undef REG_INDEX + +-#ifdef i386 ++#ifdef i586 + #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg + + regs[REG_INDEX(GS)] = (uintptr_t) gregs.r_gs; +@@ -388,7 +392,7 @@ + regs[REG_INDEX(CS)] = (uintptr_t) gregs.r_cs; + regs[REG_INDEX(SS)] = (uintptr_t) gregs.r_ss; + +-#endif /* i386 */ ++#endif /* i586 */ + + #ifdef amd64 + #define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg