--- a/make/hotspot/gensrc/GensrcAdlc.gmk	Tue Oct 29 11:13:39 2019 +0100
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk	Tue Oct 29 11:17:25 2019 +0100
@@ -75,7 +75,7 @@
       OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc, \
       DEBUG_SYMBOLS := false, \
       DISABLED_WARNINGS_clang := tautological-compare, \
-      DISABLED_WARNINGS_solstudio := notemsource, \
+      DEFINE_THIS_FILE := false, \
   ))
 
   ADLC_TOOL := $(BUILD_ADLC_TARGET)
@@ -204,6 +204,6 @@
 	     {print}' \
 	    < $(ADLC_SUPPORT_DIR)/$* > $@
 
-  TARGETS := $(ADLC_GENERATED_FILES)
+  TARGETS += $(ADLC_GENERATED_FILES)
 
 endif