diff -urNp jdk11u-jdk-11.0.14-orig/make/autoconf/bootcycle-spec.gmk.in jdk11u-jdk-11.0.14-dwok/make/autoconf/bootcycle-spec.gmk.in
--- jdk11u-jdk-11.0.14-orig/make/autoconf/bootcycle-spec.gmk.in	2022-01-13 22:56:25.000000000 +0100
+++ jdk11u-jdk-11.0.14-dwok/make/autoconf/bootcycle-spec.gmk.in	2022-02-12 18:58:44.946471770 +0100
@@ -50,11 +50,11 @@ OLD_OUTPUTDIR:=@OUTPUTDIR@
 OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build
 SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_DIR))
 
-JAVA_CMD:=$(BOOT_JDK)/bin/java
-JAVAC_CMD:=$(BOOT_JDK)/bin/javac
-JAR_CMD:=$(BOOT_JDK)/bin/jar
-JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
-SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
+JAVA_CMD := /usr/bin/setarch x86_64 -S $(BOOT_JDK)/bin/java
+JAVAC_CMD := /usr/bin/setarch x86_64 -S $(BOOT_JDK)/bin/javac
+JAR_CMD := /usr/bin/setarch x86_64 -S $(BOOT_JDK)/bin/jar
+JARSIGNER_CMD := /usr/bin/setarch x86_64 -S $(BOOT_JDK)/bin/jarsigner
+SJAVAC_SERVER_JAVA_CMD := /usr/bin/setarch x86_64 -S $(JAVA_CMD)
 # When building a 32bit target, make sure the sjavac server flags are compatible
 # with a 32bit JVM.
 ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
diff -urNp jdk11u-jdk-11.0.14-orig/make/autoconf/compare.sh.in jdk11u-jdk-11.0.14-dwok/make/autoconf/compare.sh.in
--- jdk11u-jdk-11.0.14-orig/make/autoconf/compare.sh.in	2022-01-13 22:56:25.000000000 +0100
+++ jdk11u-jdk-11.0.14-dwok/make/autoconf/compare.sh.in	2022-02-12 18:59:50.835484065 +0100
@@ -73,14 +73,14 @@ export TOPDIR="@TOPDIR@"
 export OUTPUTDIR="@OUTPUTDIR@"
 
 if [ "@COMPILE_TYPE@" != "cross" ]; then
-    export JAVAP="@FIXPATH@ $OUTPUTDIR/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
-    export JIMAGE="@FIXPATH@ $OUTPUTDIR/jdk/bin/jimage"
+    export JAVAP="@FIXPATH@ /usr/bin/setarch x86_64 -S $OUTPUTDIR/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
+    export JIMAGE="@FIXPATH@ /usr/bin/setarch x86_64 -S $OUTPUTDIR/jdk/bin/jimage"
 elif [ "@CREATE_BUILDJDK@" = "true" ]; then
-    export JAVAP="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
-    export JIMAGE="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/jimage"
+    export JAVAP="@FIXPATH@ /usr/bin/setarch x86_64 -S $OUTPUTDIR/buildjdk/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
+    export JIMAGE="@FIXPATH@ /usr/bin/setarch x86_64 -S $OUTPUTDIR/buildjdk/jdk/bin/jimage"
 else
-    export JAVAP="@FIXPATH@ @BUILD_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
-    export JIMAGE="@FIXPATH@ @BUILD_JDK@/bin/jimage"
+    export JAVAP="@FIXPATH@ /usr/bin/setarch x86_64 -S @BUILD_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
+    export JIMAGE="@FIXPATH@ /usr/bin/setarch x86_64 -S @BUILD_JDK@/bin/jimage"
 fi
 
 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
diff -urNp jdk11u-jdk-11.0.14-orig/make/autoconf/spec.gmk.in jdk11u-jdk-11.0.14-dwok/make/autoconf/spec.gmk.in
--- jdk11u-jdk-11.0.14-orig/make/autoconf/spec.gmk.in	2022-01-13 22:56:25.000000000 +0100
+++ jdk11u-jdk-11.0.14-dwok/make/autoconf/spec.gmk.in	2022-02-12 19:02:49.930235031 +0100
@@ -606,18 +606,18 @@ JARSIGNER_CMD:=@JARSIGNER@
 SJAVAC_SERVER_JAVA_CMD:=@SJAVAC_SERVER_JAVA@
 # These variables are meant to be used. They are defined with = instead of := to make
 # it possible to override only the *_CMD variables.
-JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
-JAVAC=@FIXPATH@ $(JAVAC_CMD)
-JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
-JAR=@FIXPATH@ $(JAR_CMD)
-JLINK = @FIXPATH@ $(JLINK_CMD)
-JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
-JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
+JAVA = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+JAVA_SMALL = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVA_JAVAC = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
+JAVAC = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JAVAC_CMD)
+JAVADOC = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JAVADOC_CMD)
+JAR = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JAR_CMD)
+JLINK = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JLINK_CMD)
+JMOD = @FIXPATH@ /usr/bin/setarch x86_64 -S $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
+JARSIGNER = @FIXPATH@ $(JARSIGNER_CMD)
 # A specific java binary with specific options can be used to run
 # the long running background sjavac servers and other long running tasks.
-SJAVAC_SERVER_JAVA=@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \
+SJAVAC_SERVER_JAVA = @FIXPATH@ /usr/bin/setarch x86_64 -S @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \
     $(SJAVAC_SERVER_JAVA_FLAGS)
 
 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
@@ -626,8 +626,8 @@ JAVAC_FLAGS?=@JAVAC_FLAGS@
 
 
 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
-BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
-BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
+BUILD_JAVA = @FIXPATH@ /usr/bin/setarch x86_64 -S $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
+BUILD_JAR = @FIXPATH@ /usr/bin/setarch x86_64 -S $(BUILD_JDK)/bin/jar
 
 # Interim langtools and rmic modules and arguments
 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
diff -urNp jdk11u-jdk-11.0.14-orig/make/GenerateLinkOptData.gmk jdk11u-jdk-11.0.14-dwok/make/GenerateLinkOptData.gmk
--- jdk11u-jdk-11.0.14-orig/make/GenerateLinkOptData.gmk	2022-01-13 22:56:25.000000000 +0100
+++ jdk11u-jdk-11.0.14-dwok/make/GenerateLinkOptData.gmk	2022-02-12 18:54:25.766489836 +0100
@@ -61,7 +61,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/
 	$(call MakeDir, $(LINK_OPT_DIR))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
+	$(FIXPATH) /usr/bin/setarch x86_64 -S $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist \
diff -urNp jdk11u-jdk-11.0.14-orig/make/RunTests.gmk jdk11u-jdk-11.0.14-dwok/make/RunTests.gmk
--- jdk11u-jdk-11.0.14-orig/make/RunTests.gmk	2022-01-13 22:56:25.000000000 +0100
+++ jdk11u-jdk-11.0.14-dwok/make/RunTests.gmk	2022-02-12 18:55:09.415160440 +0100
@@ -188,11 +188,11 @@ define SetupAotModuleBody
 	$$(call LogWarn, Generating $$(patsubst $$(OUTPUTDIR)/%, %, $$@))
 	$$(call MakeTargetDir)
 	$$(call ExecuteWithLog, $$@, ( \
-	    $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/jaotc \
+	    $$(FIXPATH) /usr/bin/setarch x86_64 -S $$(JDK_IMAGE_DIR)/bin/jaotc \
 	        $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \
 	))
 	$$(call ExecuteWithLog, $$@.check, ( \
-	    $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/java \
+	    $$(FIXPATH) /usr/bin/setarch x86_64 -S $$(JDK_IMAGE_DIR)/bin/java \
 	        $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions \
 	        -XX:+PrintAOT -XX:+UseAOTStrictLoading \
 	        -XX:AOTLibrary=$$@ -version \
@@ -527,7 +527,7 @@ define SetupRunGtestTestBody
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \
-	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
+	    $$(FIXPATH) /usr/bin/setarch x86_64 -S $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
 	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
 	        --gtest_catch_exceptions=0 \
diff -urNp jdk11u-jdk-11.0.14-orig/make/RunTestsPrebuiltSpec.gmk jdk11u-jdk-11.0.14-dwok/make/RunTestsPrebuiltSpec.gmk
--- jdk11u-jdk-11.0.14-orig/make/RunTestsPrebuiltSpec.gmk	2022-01-13 22:56:25.000000000 +0100
+++ jdk11u-jdk-11.0.14-dwok/make/RunTestsPrebuiltSpec.gmk	2022-02-12 18:56:15.956182744 +0100
@@ -115,14 +115,14 @@ JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink
 JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod
 JARSIGNER_CMD := $(BOOT_JDK)/bin/jarsigner
 
-JAVA := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVA_JAVAC := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVAC := $(FIXPATH) $(JAVAC_CMD)
-JAR := $(FIXPATH) $(JAR_CMD)
-JLINK := $(FIXPATH) $(JLINK_CMD)
-JMOD := $(FIXPATH) $(JMOD_CMD)
-JARSIGNER := $(FIXPATH) $(JARSIGNER_CMD)
+JAVA := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+JAVA_SMALL := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVA_JAVAC := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVAC := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JAVAC_CMD)
+JAR := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JAR_CMD)
+JLINK := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JLINK_CMD)
+JMOD := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JMOD_CMD)
+JARSIGNER := $(FIXPATH) /usr/bin/setarch x86_64 -S $(JARSIGNER_CMD)
 
 BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################