java/openjdk8: Update to 8u312

This commit is contained in:
Greg Lewis 2021-10-31 11:06:51 -07:00
parent 276ed7807d
commit 4568b98a98
3 changed files with 6 additions and 36 deletions

View File

@ -1,6 +1,5 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= LOCAL/jkim:jtreg
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
@ -52,8 +51,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE}
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
JDK_UPDATE_VERSION= 302
JDK_BUILD_NUMBER= 08
JDK_UPDATE_VERSION= 312
JDK_BUILD_NUMBER= 07
BSD_JDK_VERSION= 1
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
@ -205,12 +204,7 @@ LIB_DEPENDS+= libffi.so:devel/libffi
MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
CONFIGURE_ENV+= LIBCXX="-lc++"
.if ${COMPILER_VERSION} >= 130
# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
# See also https://bugs.openjdk.java.net/browse/JDK-8229258
LLVM_VER= 12
BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
CC= ${LOCALBASE}/bin/clang${LLVM_VER}
CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"
.endif
.endif

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1627694630
TIMESTAMP = 1635648139
SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
SIZE (jtreg4.1-b08.tar.gz) = 6834252
SHA256 (battleblow-jdk8u-8.302.08.1-jdk8u302-b08.1_GH0.tar.gz) = 783cc53f718717bcdc27d821ce808335da4d8323dc75d883b243fb19e4ca0970
SIZE (battleblow-jdk8u-8.302.08.1-jdk8u302-b08.1_GH0.tar.gz) = 88617241
SHA256 (battleblow-jdk8u-8.312.07.1-jdk8u312-b07.1_GH0.tar.gz) = c81bcd75e6aa6660584df909ccd23938292eee072924fdb95d4400ba1ab021a0
SIZE (battleblow-jdk8u-8.312.07.1-jdk8u312-b07.1_GH0.tar.gz) = 88671270

View File

@ -1,24 +0,0 @@
--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig 2021-04-26 16:05:58 UTC
+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -446,21 +446,6 @@ extern "C" {
}
};
-/////////////////////////////////////////////////////////////////////////////
-// Implementations of atomic operations not supported by processors.
-// -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html
-
-#ifndef _LP64
-extern "C" {
- long long unsigned int __sync_val_compare_and_swap_8(
- volatile void *ptr,
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
- return 0; // silence compiler warnings
- }
-};
-#endif // !_LP64
#ifndef PRODUCT
void os::verify_stack_alignment() {