diff options
Diffstat (limited to 'java')
6 files changed, 4 insertions, 103 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index 88a1dcf44a1c..3322c6cccb3b 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -57,7 +56,7 @@ JDK_MAJOR_VERSION= 12 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 2 JDK_BUILD_NUMBER= 10 -BSD_JDK_VERSION= 2 +BSD_JDK_VERSION= 3 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=${CC} \ diff --git a/java/openjdk12/distinfo b/java/openjdk12/distinfo index e81aac7cc37d..3e88a0cb50b1 100644 --- a/java/openjdk12/distinfo +++ b/java/openjdk12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565671800 -SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 7038f9264880a343334e5a80c59ac6265e32ed6e9cff0d122b0a7f70826fde67 -SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 110452445 +TIMESTAMP = 1568965165 +SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-3_GH0.tar.gz) = 4d91cd8b9196b086b72d2777818912a758a394758ed642bfe5abd1adf7547fe1 +SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-3_GH0.tar.gz) = 110456933 diff --git a/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp deleted file mode 100644 index 43d30609a667..000000000000 --- a/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 diff --git a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp deleted file mode 100644 index 49ccc99bb889..000000000000 --- a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp +++ /dev/null @@ -1,61 +0,0 @@ ---- 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; diff --git a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp deleted file mode 100644 index 701059058259..000000000000 --- a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp -+++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp -@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig, - // Handle ALL stack overflow variations here - if (sig == SIGSEGV || sig == SIGBUS) { - address addr = (address) info->si_addr; -+#ifdef __FreeBSD__ -+ addr = align_down(addr, os::vm_page_size()); -+#endif - - // check if fault address is within thread stack - if (thread->on_local_stack(addr)) { diff --git a/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c b/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c deleted file mode 100644 index 545081d1f3f0..000000000000 --- a/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c -+++ src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c -@@ -27,8 +27,8 @@ - #include <stdlib.h> - #include <string.h> - #include <errno.h> --#include <sys/sysctl.h> - #include <sys/types.h> -+#include <sys/sysctl.h> - #include <sys/wait.h> - #include <sys/ptrace.h> - #include <sys/param.h> |