From 6008defd0f90b53732ced5bd9060f7ca001524d0 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Fri, 15 Jun 2018 14:30:02 +0200
Subject: [PATCH] 8205104: EXTRA_LDFLAGS not consistently being used Summary:
 Add EXTRA_LDFLAGS to linker flags for relevant libraries. Reviewed-by: ihse

---
 make/aix/makefiles/jsig.make     | 2 +-
 make/aix/makefiles/saproc.make   | 2 +-
 make/aix/makefiles/vm.make       | 2 +-
 make/bsd/makefiles/jsig.make     | 2 +-
 make/bsd/makefiles/saproc.make   | 2 +-
 make/bsd/makefiles/vm.make       | 2 +-
 make/linux/makefiles/jsig.make   | 2 +-
 make/linux/makefiles/saproc.make | 2 +-
 make/linux/makefiles/vm.make     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/make/aix/makefiles/jsig.make b/make/aix/makefiles/jsig.make
index 301aa8419..f8bf93872 100644
--- a/make/aix/makefiles/jsig.make
+++ b/make/aix/makefiles/jsig.make
@@ -45,7 +45,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
 # cause problems with interposing. See CR: 6466665
 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
 
-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
 LFLAGS_JSIG += $(BIN_UTILS)
 
diff --git a/make/aix/makefiles/saproc.make b/make/aix/makefiles/saproc.make
index a7f28914a..d515ac2d8 100644
--- a/make/aix/makefiles/saproc.make
+++ b/make/aix/makefiles/saproc.make
@@ -66,7 +66,7 @@ endif
 endif
 
 
-SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
 	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
diff --git a/make/aix/makefiles/vm.make b/make/aix/makefiles/vm.make
index ab994a3c2..d989dab0c 100644
--- a/make/aix/makefiles/vm.make
+++ b/make/aix/makefiles/vm.make
@@ -117,7 +117,7 @@ CFLAGS += $(CFLAGS/NOEX)
 
 # Extra flags from gnumake's invocation or environment
 CFLAGS += $(EXTRA_CFLAGS)
-LFLAGS += $(EXTRA_CFLAGS)
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
 
 # Don't set excutable bit on stack segment
 # the same could be done by separate execstack command
diff --git a/make/bsd/makefiles/jsig.make b/make/bsd/makefiles/jsig.make
index 67cb4296e..29779b002 100644
--- a/make/bsd/makefiles/jsig.make
+++ b/make/bsd/makefiles/jsig.make
@@ -52,7 +52,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
 # cause problems with interposing. See CR: 6466665
 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
 
-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
 # DEBUG_BINARIES overrides everything, use full -g debug information
 ifeq ($(DEBUG_BINARIES), true)
diff --git a/make/bsd/makefiles/saproc.make b/make/bsd/makefiles/saproc.make
index 77dc9f772..89679100e 100644
--- a/make/bsd/makefiles/saproc.make
+++ b/make/bsd/makefiles/saproc.make
@@ -114,7 +114,7 @@ else
 # bring in minimum version argument or we'll fail on OSX 10.10
 SA_LFLAGS = $(LFLAGS)
 endif
-SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
 BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
   -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
diff --git a/make/bsd/makefiles/vm.make b/make/bsd/makefiles/vm.make
index 93640d8f0..60d3a204b 100644
--- a/make/bsd/makefiles/vm.make
+++ b/make/bsd/makefiles/vm.make
@@ -119,7 +119,7 @@ CFLAGS += $(CFLAGS/NOEX)
 
 # Extra flags from gnumake's invocation or environment
 CFLAGS += $(EXTRA_CFLAGS)
-LFLAGS += $(EXTRA_CFLAGS)
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
 
 # Don't set excutable bit on stack segment
 # the same could be done by separate execstack command
diff --git a/make/linux/makefiles/jsig.make b/make/linux/makefiles/jsig.make
index 5831bbc7f..be5456569 100644
--- a/make/linux/makefiles/jsig.make
+++ b/make/linux/makefiles/jsig.make
@@ -44,7 +44,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
 # cause problems with interposing. See CR: 6466665
 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
 
-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
 
 # DEBUG_BINARIES overrides everything, use full -g debug information
 ifeq ($(DEBUG_BINARIES), true)
diff --git a/make/linux/makefiles/saproc.make b/make/linux/makefiles/saproc.make
index e203eea0c..9bd8ba259 100644
--- a/make/linux/makefiles/saproc.make
+++ b/make/linux/makefiles/saproc.make
@@ -74,7 +74,7 @@ else
 ALT_SAINCDIR=
 endif
 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) \
-            $(LDFLAGS_NO_EXEC_STACK)
+            $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
 
 SAARCH ?= $(BUILDARCH)
 
diff --git a/make/linux/makefiles/vm.make b/make/linux/makefiles/vm.make
index 1a48df939..72f8d1157 100644
--- a/make/linux/makefiles/vm.make
+++ b/make/linux/makefiles/vm.make
@@ -122,7 +122,7 @@ CFLAGS += $(CFLAGS/NOEX)
 
 # Extra flags from gnumake's invocation or environment
 CFLAGS += $(EXTRA_CFLAGS)
-LFLAGS += $(EXTRA_CFLAGS)
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
 
 # Don't set excutable bit on stack segment
 # the same could be done by separate execstack command
-- 
GitLab