From nobody Sun May 08 03:52:24 2022 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 A4B181ABE25F; Sun, 8 May 2022 03:52:24 +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 4Kwr3X4Cfcz3Byh; Sun, 8 May 2022 03:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651981944; 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=rxUnzbMn8ajWy9haQJSzfEOeuufKTW9TwkzuaP1FJcI=; b=NPAqcOfEo8lKkz/og8pbhB5JkE50IMerCuv1Cw/q8DbsiQas6cT0XD2WHImt+fRCUOEFYH kYhTP2nuMootJVGMPGaf7br2F36rCtGIwjHwoomivGZlTAfEJz6BdcE81IeBlwnK+L45mp 9BDr/Gq7CDTi1Y0TixtmfR5fjGEibwXr7Me6BG7ebXvwGxuSzEh+8rqbOgq73gAERQQXBY tmZDPqWHvhTg7B1ZJbrQQP1S/ZLkzIqlF9NnN7DGnGQ6fK5YlV5dAdCcrpE+JERvMmO/wv XdQMzP6rjrtm5MYzJBH70KPP6UdVvvPe/454EVjt0rs9decPg98VBG0q9P3ITA== 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 716671DCA1; Sun, 8 May 2022 03:52:24 +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 2483qO7u088536; Sun, 8 May 2022 03:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2483qOHa088535; Sun, 8 May 2022 03:52:24 GMT (envelope-from git) Date: Sun, 8 May 2022 03:52:24 GMT Message-Id: <202205080352.2483qOHa088535@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: 54d64d5a985f - main - java/openjdk8: Fix the build on aarch64 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: 54d64d5a985fe0b85f3a9b3c6a4ed6840e5f2117 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651981944; 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=rxUnzbMn8ajWy9haQJSzfEOeuufKTW9TwkzuaP1FJcI=; b=tMo43oeZrRFJhrow1OOp5eNgt+WPAWUAFhtwrDWEuhOw3SeUEzvpZTvib0xvubJsYjp6tl YqKyUSYIxuDOYZhexv/qP2t2+sO8scAOIBsyVlbi/USvPQN3C33VLSE065PHA0ipXdtVk6 TVISPgMRsFlUQVMl05BOVDlyJtFIUYadYqz6jm5VFhz+7pm9JFNoH5hHaKF8g0Uh5pdPVI 040jJ2gAQCbaCh7QilKK+Bvl5jEH8dcTEbXiA6pP1jmByIvNujKcvunXr357+0nRV/RfCl 2uNiA6ar6aZmLPZJRZ615THGFC8UeNVGWOOtV9HxJ2G/aEvJk9GXkFKCrItQcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651981944; a=rsa-sha256; cv=none; b=k30xa5Y/SjzS8Np5nuSS9JtF79xIUfFb0MueHVQOYOY+wJ40RaAsr7Dp6ydH93izNvXAwf hHnNIPkclvFpfIbliz4bSDUhklB79xMU/hwXOLf5diV9tk2w9nV58qCYppAV+H6VK6fQOA RhJL4C9F9oZDbkg64MfKZbs1VJOKJ+Epmea7zUWVMqOcgTj5XbzInIpHQqBQfDbrWhXFcx u91uOfbjinKjr7gkfvNgmR9MV9zgwDAwECGCgPzGCLdghUs/9hsuc8v1Ey68PUVKPDli1d qh/6DP/hdUceescN/5+VN5YOlmYKR9XSNsFHryz64B56yolpUPC5pHPAgnaPNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=54d64d5a985fe0b85f3a9b3c6a4ed6840e5f2117 commit 54d64d5a985fe0b85f3a9b3c6a4ed6840e5f2117 Author: Greg Lewis AuthorDate: 2022-05-08 03:51:19 +0000 Commit: Greg Lewis CommitDate: 2022-05-08 03:51:19 +0000 java/openjdk8: Fix the build on aarch64 --- ...-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp | 14 ++++++++ ..._bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp | 39 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp new file mode 100644 index 000000000000..0495a62ccb3b --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp @@ -0,0 +1,14 @@ +--- hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp ++++ hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp +@@ -25,7 +25,11 @@ + #ifndef CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP + #define CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP + ++#if defined(LINUX) + #include "pauth_linux_aarch64.inline.hpp" ++#elif defined(_ALLBSD_SOURCE) ++#include "pauth_bsd_aarch64.inline.hpp" ++#endif + + inline bool pauth_ptr_is_raw(address ptr) { + // Confirm none of the high bits are set in the pointer. diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp new file mode 100644 index 000000000000..1a5fcc0463a8 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp @@ -0,0 +1,39 @@ +--- hotspot/src/os_cpu/bsd_aarch64/vm/pauth_bsd_aarch64.inline.hpp ++++ hotspot/src/os_cpu/bsd_aarch64/vm/pauth_bsd_aarch64.inline.hpp +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (c) 2021, 2022, Arm Limited. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++#ifndef OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP ++#define OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP ++ ++// OS specific Support for ROP Protection in VM code. ++// For more details on PAC see pauth_aarch64.hpp. ++ ++inline address pauth_strip_pointer(address ptr) { ++ // No PAC support in BSD as of yet. ++ return ptr; ++} ++ ++#endif // OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP