Date: Fri, 30 Aug 2019 04:24:53 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510231 - in head/java/openjdk11: . files Message-ID: <201908300424.x7U4Ore0013336@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Aug 30 04:24:53 2019 New Revision: 510231 URL: https://svnweb.freebsd.org/changeset/ports/510231 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/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp (contents, props changed) head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp (contents, props changed) Modified: head/java/openjdk11/Makefile Modified: head/java/openjdk11/Makefile ============================================================================== --- head/java/openjdk11/Makefile Fri Aug 30 01:29:52 2019 (r510230) +++ head/java/openjdk11/Makefile Fri Aug 30 04:24:53 2019 (r510231) @@ -126,6 +126,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/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp Fri Aug 30 04:24:53 2019 (r510231) @@ -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/openjdk11/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/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp Fri Aug 30 04:24:53 2019 (r510231) @@ -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 <machine/elf.h> + #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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908300424.x7U4Ore0013336>