8286757: adlc tries to build with /pathmap but without /experimental:deterministic

erikj79 · erikj79 · commit 242eeaea47a2 · 2023-09-20T12:48:19.000Z
Reviewed-by: jwaters, ihse
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
@@ -818,6 +818,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
             REPRODUCIBLE_CFLAGS=
         ]
     )
+    AC_SUBST(REPRODUCIBLE_CFLAGS)
   fi
 
   # Prevent the __FILE__ macro from generating absolute paths into the built
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
@@ -424,6 +424,7 @@ LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
 ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
+REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
 BRANCH_PROTECTION_CFLAGS := @BRANCH_PROTECTION_CFLAGS@
 
 STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -62,7 +62,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
   # Add file macro mappings
-  ADLC_CFLAGS += $(FILE_MACRO_CFLAGS)
+  ADLC_CFLAGS += $(FILE_MACRO_CFLAGS) $(REPRODUCIBLE_CFLAGS)
 
   ifeq ($(UBSAN_ENABLED), true)
     ADLC_CFLAGS += $(UBSAN_CFLAGS)

Original file line number	Diff line number	Diff line change
`@@ -818,6 +818,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],`
`818`	`818`	`REPRODUCIBLE_CFLAGS=`
`819`	`819`	`]`
`820`	`820`	`)`
	`821`	`+ AC_SUBST(REPRODUCIBLE_CFLAGS)`
`821`	`822`	`fi`
`822`	`823`
`823`	`824`	`# Prevent the __FILE__ macro from generating absolute paths into the built`