[GR-67177] Failure: daily-vm-ee-graalvm-ni-jck-jdk-26-preserve-all-ee-1/3-windows-amd64

PullRequest: graal/21468

Author: kittyoracle

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -396,9 +396,9 @@ public static void configureOs(EconomicMap<OptionKey<?>, Object> values) {
         ConcealedOptions.CodeAlignment.update(values, 1);
         GraalOptions.LoopHeaderAlignment.update(values, 0);
         GraalOptions.IsolatedLoopHeaderAlignment.update(values, 0);
-        if (ConfigurationValues.getTarget().arch instanceof AMD64) {
-            disable(AMD64Assembler.Options.UseBranchesWithin32ByteBoundary, values);
-        }
+        // We cannot check for architecture at the moment because ImageSingletons has not been
+        // initialized yet
+        disable(AMD64Assembler.Options.UseBranchesWithin32ByteBoundary, values);
 
         /*
          * Do not run PEA - it can fan out allocations too much.