Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
8205104: EXTRA_LDFLAGS not consistently being used
Fri, 15 Jun 2018 14:30:02 +0200
- author
- sgehwolf
- date
- Fri, 15 Jun 2018 14:30:02 +0200
- changeset 9330
- f175513c2c3a
- parent 9329
- c741a7bc982a
- child 9332
- ae93017b2930
8205104: EXTRA_LDFLAGS not consistently being used
Summary: Add EXTRA_LDFLAGS to linker flags for relevant libraries.
Reviewed-by: ihse
1.1 --- a/make/aix/makefiles/jsig.make Thu Jun 14 21:39:57 2018 +0000 1.2 +++ b/make/aix/makefiles/jsig.make Fri Jun 15 14:30:02 2018 +0200 1.3 @@ -45,7 +45,7 @@ 1.4 # cause problems with interposing. See CR: 6466665 1.5 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) 1.6 1.7 -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) 1.8 +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) 1.9 1.10 LFLAGS_JSIG += $(BIN_UTILS) 1.11
2.1 --- a/make/aix/makefiles/saproc.make Thu Jun 14 21:39:57 2018 +0000 2.2 +++ b/make/aix/makefiles/saproc.make Fri Jun 15 14:30:02 2018 +0200 2.3 @@ -66,7 +66,7 @@ 2.4 endif 2.5 2.6 2.7 -SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) 2.8 +SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) 2.9 2.10 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) 2.11 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
3.1 --- a/make/aix/makefiles/vm.make Thu Jun 14 21:39:57 2018 +0000 3.2 +++ b/make/aix/makefiles/vm.make Fri Jun 15 14:30:02 2018 +0200 3.3 @@ -117,7 +117,7 @@ 3.4 3.5 # Extra flags from gnumake's invocation or environment 3.6 CFLAGS += $(EXTRA_CFLAGS) 3.7 -LFLAGS += $(EXTRA_CFLAGS) 3.8 +LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) 3.9 3.10 # Don't set excutable bit on stack segment 3.11 # the same could be done by separate execstack command
4.1 --- a/make/bsd/makefiles/jsig.make Thu Jun 14 21:39:57 2018 +0000 4.2 +++ b/make/bsd/makefiles/jsig.make Fri Jun 15 14:30:02 2018 +0200 4.3 @@ -52,7 +52,7 @@ 4.4 # cause problems with interposing. See CR: 6466665 4.5 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) 4.6 4.7 -LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) 4.8 +LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) 4.9 4.10 # DEBUG_BINARIES overrides everything, use full -g debug information 4.11 ifeq ($(DEBUG_BINARIES), true)
5.1 --- a/make/bsd/makefiles/saproc.make Thu Jun 14 21:39:57 2018 +0000 5.2 +++ b/make/bsd/makefiles/saproc.make Fri Jun 15 14:30:02 2018 +0200 5.3 @@ -114,7 +114,7 @@ 5.4 # bring in minimum version argument or we'll fail on OSX 10.10 5.5 SA_LFLAGS = $(LFLAGS) 5.6 endif 5.7 -SA_LFLAGS += $(LDFLAGS_HASH_STYLE) 5.8 +SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) 5.9 5.10 BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \ 5.11 -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
6.1 --- a/make/bsd/makefiles/vm.make Thu Jun 14 21:39:57 2018 +0000 6.2 +++ b/make/bsd/makefiles/vm.make Fri Jun 15 14:30:02 2018 +0200 6.3 @@ -119,7 +119,7 @@ 6.4 6.5 # Extra flags from gnumake's invocation or environment 6.6 CFLAGS += $(EXTRA_CFLAGS) 6.7 -LFLAGS += $(EXTRA_CFLAGS) 6.8 +LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) 6.9 6.10 # Don't set excutable bit on stack segment 6.11 # the same could be done by separate execstack command
7.1 --- a/make/linux/makefiles/jsig.make Thu Jun 14 21:39:57 2018 +0000 7.2 +++ b/make/linux/makefiles/jsig.make Fri Jun 15 14:30:02 2018 +0200 7.3 @@ -44,7 +44,7 @@ 7.4 # cause problems with interposing. See CR: 6466665 7.5 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) 7.6 7.7 -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) 7.8 +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS) 7.9 7.10 # DEBUG_BINARIES overrides everything, use full -g debug information 7.11 ifeq ($(DEBUG_BINARIES), true)
8.1 --- a/make/linux/makefiles/saproc.make Thu Jun 14 21:39:57 2018 +0000 8.2 +++ b/make/linux/makefiles/saproc.make Fri Jun 15 14:30:02 2018 +0200 8.3 @@ -74,7 +74,7 @@ 8.4 ALT_SAINCDIR= 8.5 endif 8.6 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) \ 8.7 - $(LDFLAGS_NO_EXEC_STACK) 8.8 + $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS) 8.9 8.10 SAARCH ?= $(BUILDARCH) 8.11
9.1 --- a/make/linux/makefiles/vm.make Thu Jun 14 21:39:57 2018 +0000 9.2 +++ b/make/linux/makefiles/vm.make Fri Jun 15 14:30:02 2018 +0200 9.3 @@ -122,7 +122,7 @@ 9.4 9.5 # Extra flags from gnumake's invocation or environment 9.6 CFLAGS += $(EXTRA_CFLAGS) 9.7 -LFLAGS += $(EXTRA_CFLAGS) 9.8 +LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) 9.9 9.10 # Don't set excutable bit on stack segment 9.11 # the same could be done by separate execstack command
