cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 12.0.2+10.4

Browse Source 
PR:		244947
Submitted by:	Trond.Endrestol@ximalas.info
This commit is contained in:
Greg Lewis 2020-04-18 20:42:11 +00:00
parent cd69a3edf4
commit 1007ca9d59
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=532044
3 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/openjdk12/Makefile
View File

@ -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= 3
BSD_JDK_VERSION= 4
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC=${CC} \

6
java/openjdk12/distinfo
View File

@ -1,3 +1,3 @@
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
TIMESTAMP = 1587166133
SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-4_GH0.tar.gz) = 4cff87c7eb06005bc7d98705139479e24907f410e1c22163e5df0e3c68868048
SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-4_GH0.tar.gz) = 110454275

59
java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp
View File

@ -1,59 +0,0 @@
--- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp
+++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp
@@ -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
@@ -240,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;
}