summaryrefslogtreecommitdiff
path: root/java/openjdk8
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk8')
-rw-r--r--java/openjdk8/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 13b7e8881df5..77d3862aa569 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -204,7 +204,7 @@ LIB_DEPENDS+= libffi.so:devel/libffi
.if ${COMPILER_TYPE} == clang
MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
CONFIGURE_ENV+= LIBCXX="-lc++"
-.if ${COMPILER_VERSION} >= 130 && ${ARCH} == aarch64
+.if ${ARCH} == aarch64
# PR258954: see <https://bugs.openjdk.org/browse/JDK-8247766>. Even though the
# upstream fix has been applied to this version of the JDK, users still report
# the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn"
@@ -214,14 +214,12 @@ BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
CC= ${LOCALBASE}/bin/clang${LLVM_VER}
CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
.endif
-.if ${COMPILER_VERSION} >= 160
# clang 16 defaults to C++17, which no longer allows the 'register' keyword.
# There is an upstream commit that removes all the individual 'register'
# keywords, but it has not yet been backported to OpenJDK 8.
# NOTE: passing this option via --with-extra-cflags does not work.
CFLAGS+= -Dregister=
.endif
-.endif
# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
.if ${COMPILER_TYPE} == gcc