From owner-svn-ports-all@freebsd.org Fri Aug 30 04:26:02 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B353DC1232; Fri, 30 Aug 2019 04:26:02 +0000 (UTC) (envelope-from glewis@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46KRHZ4Lm2z4cs0; Fri, 30 Aug 2019 04:26:02 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7729C2ABCE; Fri, 30 Aug 2019 04:26:02 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7U4Q2e3013533; Fri, 30 Aug 2019 04:26:02 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7U4Q18b013530; Fri, 30 Aug 2019 04:26:01 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201908300426.x7U4Q18b013530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Fri, 30 Aug 2019 04:26:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510232 - in head/java/openjdk12: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/openjdk12: . files X-SVN-Commit-Revision: 510232 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Aug 2019 04:26:02 -0000 Author: glewis Date: Fri Aug 30 04:26:01 2019 New Revision: 510232 URL: https://svnweb.freebsd.org/changeset/ports/510232 Log: Prepare for aarch64 support * Add necessary configure arguments for aarch64 * Add patches needed to compile on aarch64. These have been upstreamed but are not in a release yet. Added: head/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp (contents, props changed) head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp (contents, props changed) Modified: head/java/openjdk12/Makefile Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Fri Aug 30 04:24:53 2019 (r510231) +++ head/java/openjdk12/Makefile Fri Aug 30 04:26:01 2019 (r510232) @@ -127,6 +127,11 @@ CONFIGURE_ARGS+= --disable-warnings-as-errors \ MAKE_ENV+= USE_CLANG=true .endif +.if ${ARCH} == aarch64 +CONFIGURE_ARGS+= --disable-warnings-as-errors \ + --disable-dtrace +.endif + .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else Added: head/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp Fri Aug 30 04:26:01 2019 (r510232) @@ -0,0 +1,13 @@ +--- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp ++++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +@@ -45,6 +45,10 @@ + #define getauxval(hwcap) 0 + #endif + ++#ifndef HWCAP_ASIMD ++#define HWCAP_ASIMD (1<<1) ++#endif ++ + #ifndef HWCAP_AES + #define HWCAP_AES (1<<3) + #endif Added: head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp Fri Aug 30 04:26:01 2019 (r510232) @@ -0,0 +1,61 @@ +--- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp ++++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp +@@ -32,6 +32,50 @@ + #include + #endif + ++#ifndef HWCAP_ASIMD ++#define HWCAP_ASIMD (1<<1) ++#endif ++ ++#ifndef HWCAP_AES ++#define HWCAP_AES (1<<3) ++#endif ++ ++#ifndef HWCAP_PMULL ++#define HWCAP_PMULL (1<<4) ++#endif ++ ++#ifndef HWCAP_SHA1 ++#define HWCAP_SHA1 (1<<5) ++#endif ++ ++#ifndef HWCAP_SHA2 ++#define HWCAP_SHA2 (1<<6) ++#endif ++ ++#ifndef HWCAP_CRC32 ++#define HWCAP_CRC32 (1<<7) ++#endif ++ ++#ifndef HWCAP_ATOMICS ++#define HWCAP_ATOMICS (1<<8) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_SHIFT ++#define ID_AA64PFR0_AdvSIMD_SHIFT 20 ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD ++#define ID_AA64PFR0_AdvSIMD(x) ((x) & (UL(0xf) << ID_AA64PFR0_AdvSIMD_SHIFT)) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_IMPL ++#define ID_AA64PFR0_AdvSIMD_IMPL (UL(0x0) << ID_AA64PFR0_AdvSIMD_SHIFT) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_HP ++#define ID_AA64PFR0_AdvSIMD_HP (UL(0x1) << ID_AA64PFR0_AdvSIMD_SHIFT) ++#endif ++ + #define CPU_IMPL_ARM 0x41 + #define CPU_IMPL_BROADCOM 0x42 + #define CPU_IMPL_CAVIUM 0x43 +@@ -113,6 +157,7 @@ + #define CPU_PART(midr) (((midr) >> 4) & 0xfff) + #define CPU_VAR(midr) (((midr) >> 20) & 0xf) + #define CPU_REV(midr) (((midr) >> 0) & 0xf) ++#define UL(x) UINT64_C(x) + + struct cpu_desc { + u_int cpu_impl;