|
 |
f78b6c |
# HG changeset patch
|
|
|
f78b6c |
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
|
|
|
f78b6c |
# Date 1620365804 -3600
|
|
|
f78b6c |
# Fri May 07 06:36:44 2021 +0100
|
|
|
f78b6c |
# Node ID 39b62f35eca823b4c9a98bc1dc0cb9acb87360f8
|
|
|
f78b6c |
# Parent 723b59ed1afe878c5cd35f080399c8ceec4f776b
|
|
|
f78b6c |
PR3836: Extra compiler flags not passed to adlc build
|
|
|
f78b6c |
|
|
|
f78b6c |
diff --git openjdk.orig/hotspot/make/aix/makefiles/adlc.make openjdk/hotspot/make/aix/makefiles/adlc.make
|
|
|
f78b6c |
--- openjdk.orig/hotspot/make/aix/makefiles/adlc.make
|
|
|
f78b6c |
+++ openjdk/hotspot/make/aix/makefiles/adlc.make
|
|
|
f78b6c |
@@ -69,6 +69,11 @@
|
|
|
f78b6c |
CFLAGS_WARN = -w
|
|
|
f78b6c |
CFLAGS += $(CFLAGS_WARN)
|
|
|
f78b6c |
|
|
|
f78b6c |
+# Extra flags from gnumake's invocation or environment
|
|
|
f78b6c |
+CFLAGS += $(EXTRA_CFLAGS)
|
|
|
f78b6c |
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
f78b6c |
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
|
f78b6c |
+
|
|
|
f78b6c |
OBJECTNAMES = \
|
|
|
f78b6c |
adlparse.o \
|
|
|
f78b6c |
archDesc.o \
|
|
|
f78b6c |
diff --git openjdk.orig/hotspot/make/bsd/makefiles/adlc.make openjdk/hotspot/make/bsd/makefiles/adlc.make
|
|
|
f78b6c |
--- openjdk.orig/hotspot/make/bsd/makefiles/adlc.make
|
|
|
f78b6c |
+++ openjdk/hotspot/make/bsd/makefiles/adlc.make
|
|
|
f78b6c |
@@ -71,6 +71,11 @@
|
|
|
f78b6c |
endif
|
|
|
f78b6c |
CFLAGS += $(CFLAGS_WARN)
|
|
|
f78b6c |
|
|
|
f78b6c |
+# Extra flags from gnumake's invocation or environment
|
|
|
f78b6c |
+CFLAGS += $(EXTRA_CFLAGS)
|
|
|
f78b6c |
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
f78b6c |
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
|
f78b6c |
+
|
|
|
f78b6c |
OBJECTNAMES = \
|
|
|
f78b6c |
adlparse.o \
|
|
|
f78b6c |
archDesc.o \
|
|
|
f78b6c |
diff --git openjdk.orig/hotspot/make/linux/makefiles/adlc.make openjdk/hotspot/make/linux/makefiles/adlc.make
|
|
|
f78b6c |
--- openjdk.orig/hotspot/make/linux/makefiles/adlc.make
|
|
|
f78b6c |
+++ openjdk/hotspot/make/linux/makefiles/adlc.make
|
|
|
f78b6c |
@@ -69,6 +69,11 @@
|
|
|
f78b6c |
CFLAGS_WARN = $(WARNINGS_ARE_ERRORS)
|
|
|
f78b6c |
CFLAGS += $(CFLAGS_WARN)
|
|
|
f78b6c |
|
|
|
f78b6c |
+# Extra flags from gnumake's invocation or environment
|
|
|
f78b6c |
+CFLAGS += $(EXTRA_CFLAGS)
|
|
|
f78b6c |
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
f78b6c |
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
|
f78b6c |
+
|
|
|
f78b6c |
OBJECTNAMES = \
|
|
|
f78b6c |
adlparse.o \
|
|
|
f78b6c |
archDesc.o \
|
|
|
f78b6c |
diff --git openjdk.orig/hotspot/make/solaris/makefiles/adlc.make openjdk/hotspot/make/solaris/makefiles/adlc.make
|
|
|
f78b6c |
--- openjdk.orig/hotspot/make/solaris/makefiles/adlc.make
|
|
|
f78b6c |
+++ openjdk/hotspot/make/solaris/makefiles/adlc.make
|
|
|
f78b6c |
@@ -85,6 +85,10 @@
|
|
|
f78b6c |
endif
|
|
|
f78b6c |
CFLAGS += $(CFLAGS_WARN)
|
|
|
f78b6c |
|
|
|
f78b6c |
+# Extra flags from gnumake's invocation or environment
|
|
|
f78b6c |
+CFLAGS += $(EXTRA_CFLAGS)
|
|
|
f78b6c |
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
|
f78b6c |
+
|
|
|
f78b6c |
ifeq ("${Platform_compiler}", "sparcWorks")
|
|
|
f78b6c |
# Enable the following CFLAGS addition if you need to compare the
|
|
|
f78b6c |
# built ELF objects.
|