|
 |
95d809 |
# HG changeset patch
|
|
|
95d809 |
# User andrew
|
|
|
95d809 |
# Date 1526065930 -3600
|
|
|
95d809 |
# Fri May 11 20:12:10 2018 +0100
|
|
|
95d809 |
# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
|
|
|
95d809 |
# Parent afb31413c73cbc06420fdb447aa90a7a38258904
|
|
|
95d809 |
PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
|
|
|
95d809 |
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/aix/makefiles/jsig.make
|
|
|
95d809 |
@@ -45,7 +45,7 @@
|
|
|
95d809 |
# cause problems with interposing. See CR: 6466665
|
|
|
95d809 |
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
|
|
|
95d809 |
|
|
|
95d809 |
-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
|
|
|
95d809 |
+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
LFLAGS_JSIG += $(BIN_UTILS)
|
|
|
95d809 |
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/aix/makefiles/saproc.make
|
|
|
95d809 |
@@ -66,7 +66,7 @@
|
|
|
95d809 |
endif
|
|
|
95d809 |
|
|
|
95d809 |
|
|
|
95d809 |
-SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
|
|
|
95d809 |
+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
|
|
|
95d809 |
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/aix/makefiles/vm.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/aix/makefiles/vm.make
|
|
|
95d809 |
@@ -117,7 +117,7 @@
|
|
|
95d809 |
|
|
|
95d809 |
# Extra flags from gnumake's invocation or environment
|
|
|
95d809 |
CFLAGS += $(EXTRA_CFLAGS)
|
|
|
95d809 |
-LFLAGS += $(EXTRA_CFLAGS)
|
|
|
95d809 |
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
# Don't set excutable bit on stack segment
|
|
|
95d809 |
# the same could be done by separate execstack command
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
|
|
|
95d809 |
@@ -52,7 +52,7 @@
|
|
|
95d809 |
# cause problems with interposing. See CR: 6466665
|
|
|
95d809 |
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
|
|
|
95d809 |
|
|
|
95d809 |
-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
|
|
|
95d809 |
+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
# DEBUG_BINARIES overrides everything, use full -g debug information
|
|
|
95d809 |
ifeq ($(DEBUG_BINARIES), true)
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
|
|
|
95d809 |
@@ -114,7 +114,7 @@
|
|
|
95d809 |
# bring in minimum version argument or we'll fail on OSX 10.10
|
|
|
95d809 |
SA_LFLAGS = $(LFLAGS)
|
|
|
95d809 |
endif
|
|
|
95d809 |
-SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
|
|
|
95d809 |
+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
|
|
|
95d809 |
-I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/bsd/makefiles/vm.make
|
|
|
95d809 |
@@ -119,7 +119,7 @@
|
|
|
95d809 |
|
|
|
95d809 |
# Extra flags from gnumake's invocation or environment
|
|
|
95d809 |
CFLAGS += $(EXTRA_CFLAGS)
|
|
|
95d809 |
-LFLAGS += $(EXTRA_CFLAGS)
|
|
|
95d809 |
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
# Don't set excutable bit on stack segment
|
|
|
95d809 |
# the same could be done by separate execstack command
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
|
95d809 |
@@ -44,7 +44,7 @@
|
|
|
95d809 |
# cause problems with interposing. See CR: 6466665
|
|
|
95d809 |
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
|
|
|
95d809 |
|
|
|
e71562 |
-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
|
|
|
e71562 |
+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
# DEBUG_BINARIES overrides everything, use full -g debug information
|
|
|
95d809 |
ifeq ($(DEBUG_BINARIES), true)
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/linux/makefiles/saproc.make
|
|
|
95d809 |
@@ -73,7 +73,7 @@
|
|
|
95d809 |
else
|
|
|
95d809 |
ALT_SAINCDIR=
|
|
|
95d809 |
endif
|
|
|
95d809 |
-SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
|
|
|
95d809 |
+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
SAARCH ?= $(BUILDARCH)
|
|
|
95d809 |
|
|
|
95d809 |
diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
|
|
|
95d809 |
--- openjdk.orig/hotspot/make/linux/makefiles/vm.make
|
|
|
95d809 |
+++ openjdk/hotspot/make/linux/makefiles/vm.make
|
|
|
e71562 |
@@ -122,7 +122,7 @@
|
|
|
95d809 |
|
|
|
95d809 |
# Extra flags from gnumake's invocation or environment
|
|
|
95d809 |
CFLAGS += $(EXTRA_CFLAGS)
|
|
|
95d809 |
-LFLAGS += $(EXTRA_CFLAGS)
|
|
|
95d809 |
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
95d809 |
|
|
|
95d809 |
# Don't set excutable bit on stack segment
|
|
|
95d809 |
# the same could be done by separate execstack command
|