Skip to content

Commit 7955511

Browse files
committed
openjdk11: remove aarch64 membar substs
Upstream changed from MACOS_AARCH64_ONLY to BSD_AARCH64_ONLY.
1 parent 530e979 commit 7955511

1 file changed

Lines changed: 1 addition & 21 deletions

File tree

lang/openjdk11/Makefile

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.80 2025/11/15 12:13:35 ryoon Exp $
1+
# $NetBSD: Makefile,v 1.81 2025/11/25 15:42:18 tnn Exp $
22

33
DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/}
44
PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -127,26 +127,6 @@ SUBST_FILES.fontpaths= make/data/fontconfig/bsd.fontconfig.properties
127127
SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c
128128
SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig
129129

130-
.if ${MACHINE_ARCH} == "aarch64"
131-
# See patches/patch-*threadWXSetters* for details.
132-
SUBST_CLASSES+= aa64-membar
133-
SUBST_STAGE.aa64-membar= pre-build
134-
SUBST_MESSAGE.aa64-membar= Fixing cache coherency issues
135-
SUBST_SED.aa64-membar= -e 's/MACOS_AARCH64_ONLY(ThreadWXEnable /AARCH64_ONLY(ThreadWXEnable /'
136-
SUBST_FILES.aa64-membar+= src/hotspot/share/c1/c1_Runtime1.cpp
137-
SUBST_FILES.aa64-membar+= src/hotspot/share/interpreter/interpreterRuntime.cpp
138-
SUBST_FILES.aa64-membar+= src/hotspot/share/jvmci/jvmciEnv.hpp
139-
SUBST_FILES.aa64-membar+= src/hotspot/share/opto/runtime.cpp
140-
SUBST_FILES.aa64-membar+= src/hotspot/share/prims/jniCheck.cpp
141-
SUBST_FILES.aa64-membar+= src/hotspot/share/prims/jvmtiEnter.xsl
142-
SUBST_FILES.aa64-membar+= src/hotspot/share/prims/jvmtiEnv.cpp
143-
SUBST_FILES.aa64-membar+= src/hotspot/share/prims/whitebox.inline.hpp
144-
SUBST_FILES.aa64-membar+= src/hotspot/share/runtime/deoptimization.cpp
145-
SUBST_FILES.aa64-membar+= src/hotspot/share/runtime/interfaceSupport.inline.hpp
146-
SUBST_FILES.aa64-membar+= src/hotspot/share/runtime/safepoint.cpp
147-
SUBST_FILES.aa64-membar+= src/hotspot/share/runtime/thread.cpp
148-
.endif
149-
150130
.if ${OPSYS} == "NetBSD"
151131
# NetBSD's EVFILT_* EV_* are different from FreeBSD/OpenBSD's values.
152132
SUBST_CLASSES+= kqueue

0 commit comments

Comments
 (0)