From 79a3c0ff7824a43a89f7a7cb9cc10633be02bd2e Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 17 Apr 2020 23:41:56 +0000 Subject: [PATCH] Update to 14.0.1 GA --- java/openjdk14/Makefile | 6 +- java/openjdk14/distinfo | 6 +- ...tspot_cpu_aarch64_vm__version__aarch64.cpp | 10 -- ...bsd__aarch64_vm__version__bsd__aarch64.cpp | 95 ------------------- 4 files changed, 6 insertions(+), 111 deletions(-) delete mode 100644 java/openjdk14/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp delete mode 100644 java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp diff --git a/java/openjdk14/Makefile b/java/openjdk14/Makefile index 81abe5518e0e..3f7a07889116 100644 --- a/java/openjdk14/Makefile +++ b/java/openjdk14/Makefile @@ -2,7 +2,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -54,8 +54,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 14 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 0 -JDK_BUILD_NUMBER= 36 +JDK_PATCH_VERSION= 1 +JDK_BUILD_NUMBER= 7 BSD_JDK_VERSION= 1 GNU_CONFIGURE= yes diff --git a/java/openjdk14/distinfo b/java/openjdk14/distinfo index 7563cb815e41..23244b0fffb6 100644 --- a/java/openjdk14/distinfo +++ b/java/openjdk14/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584500454 -SHA256 (battleblow-jdk14u-jdk-14+36-1_GH0.tar.gz) = 13d7b9b3e2669a889a268b74b93e99a39e3b6ba9f9d90b90fb000f4c6033126a -SIZE (battleblow-jdk14u-jdk-14+36-1_GH0.tar.gz) = 109384778 +TIMESTAMP = 1587165071 +SHA256 (battleblow-jdk14u-jdk-14.0.1+7-1_GH0.tar.gz) = c87cdd4b292d66f9cfa542d1282e8fe891ab4ba30f057c47c7a3d1bf365886f4 +SIZE (battleblow-jdk14u-jdk-14.0.1+7-1_GH0.tar.gz) = 109391336 diff --git a/java/openjdk14/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk14/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp deleted file mode 100644 index 09ab72295c53..000000000000 --- a/java/openjdk14/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp -+++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp -@@ -35,6 +35,7 @@ - - #include OS_HEADER_INLINE(os) - -+#ifndef BUILTIN_SIM - #if defined (__linux__) - #include - #include diff --git a/java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp b/java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp deleted file mode 100644 index b0410f7b9579..000000000000 --- a/java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp +++ /dev/null @@ -1,95 +0,0 @@ ---- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp -+++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp -@@ -25,10 +25,10 @@ - - #include "precompiled.hpp" - #include "runtime/os.hpp" --#include "runtime/vm_version.hpp" -+#include "vm_version_aarch64.hpp" - --#if defined (__FreeBSD__) - #include -+#if defined (__FreeBSD__) - #include - #endif - -@@ -76,6 +76,22 @@ - #define ID_AA64PFR0_AdvSIMD_HP (UL(0x1) << ID_AA64PFR0_AdvSIMD_SHIFT) - #endif - -+#ifndef ID_AA64ISAR0_AES_VAL -+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES -+#endif -+ -+#ifndef ID_AA64ISAR0_SHA1_VAL -+#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 -+#endif -+ -+#ifndef ID_AA64ISAR0_SHA2_VAL -+#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 -+#endif -+ -+#ifndef ID_AA64ISAR0_CRC32_VAL -+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 -+#endif -+ - #define CPU_IMPL_ARM 0x41 - #define CPU_IMPL_BROADCOM 0x42 - #define CPU_IMPL_CAVIUM 0x43 -@@ -186,6 +202,17 @@ const struct cpu_implementers cpu_implementers[] = { - CPU_IMPLEMENTER_NONE, - }; - -+#ifdef __OpenBSD__ -+// READ_SPECIALREG is not available from userland on OpenBSD. -+// Hardcode these values to the "lowest common denominator" -+unsigned long VM_Version::os_get_processor_features() { -+ _cpu = CPU_IMPL_ARM; -+ _model = CPU_PART_CORTEX_A53; -+ _variant = 0; -+ _revision = 0; -+ return HWCAP_ASIMD; -+} -+#else - unsigned long VM_Version::os_get_processor_features() { - struct cpu_desc cpu_desc[1]; - struct cpu_desc user_cpu_desc; -@@ -229,26 +256,26 @@ unsigned long VM_Version::os_get_processor_features() { - _model = cpu_desc[cpu].cpu_part_num; - _revision = cpu_desc[cpu].cpu_revision; - -- id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1); -- id_aa64pfr0 = READ_SPECIALREG(ID_AA64PFR0_EL1); -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); - -- if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_BASE) { -+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_BASE) { - auxv = auxv | HWCAP_AES; - } - -- if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { -+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { - auxv = auxv | HWCAP_PMULL; - } - -- if (ID_AA64ISAR0_SHA1(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { -+ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { - auxv = auxv | HWCAP_SHA1; - } - -- if (ID_AA64ISAR0_SHA2(id_aa64isar0) == ID_AA64ISAR0_SHA2_BASE) { -+ if (ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA2_BASE) { - auxv = auxv | HWCAP_SHA2; - } - -- if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { - auxv = auxv | HWCAP_CRC32; - } - -@@ -259,3 +286,4 @@ unsigned long VM_Version::os_get_processor_features() { - - return auxv; - } -+#endif