Pass ldflags to build, on BSDs.

Fixes RELRO build on NetBSD.

4 files changed, 60 insertions, 2 deletions

diff --git a/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile b/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile
new file mode 100644
index 00000000000..8d3b49c00c1
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_agent_src_os_bsd_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-hotspot_agent_src_os_bsd_Makefile,v 1.1 2017/07/24 12:27:33 wiz Exp $
+
+--- hotspot/agent/src/os/bsd/Makefile.orig	2017-04-27 09:45:04.000000000 +0000
++++ hotspot/agent/src/os/bsd/Makefile
+@@ -85,6 +85,8 @@ ifndef LDNOMAP
+   LFLAGS_LIBSA = -Xlinker --version-script=mapfile
+ endif
+ 
++LFLAGS_LIBSA += $(EXTRA_LDFLAGS)
++
+ $(LIBSA): $(OBJSPLUS) mapfile 
+ 	if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi
+ 	$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS)
diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make
index 5ae943c7a8d..52fd8ac6f0e 100644
--- a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make
+++ b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make
@@ -1,6 +1,6 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.4 2016/08/15 19:09:38 ryoon Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.5 2017/07/24 12:27:33 wiz Exp $
 
---- hotspot/make/bsd/makefiles/defs.make.orig	2016-08-11 05:37:43.000000000 +0000
+--- hotspot/make/bsd/makefiles/defs.make.orig	2017-04-27 09:45:08.000000000 +0000
 +++ hotspot/make/bsd/makefiles/defs.make
 @@ -31,7 +31,7 @@ SLASH_JAVA ?= /java
  # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
@@ -11,3 +11,14 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.4 2016/08/15 19:09:38 ry
    # Fold little endian PowerPC64 into big-endian (if ARCH is set in
    # hotspot-spec.gmk, this will be done by the configure script).
    ifeq ($(ARCH),ppc64le)
+@@ -45,6 +45,10 @@ else
+   ARCH_DATA_MODEL ?= 32
+ endif
+ 
++# Extra flags from gnumake's invocation or environment
++CFLAGS += $(EXTRA_CFLAGS)
++LFLAGS += $(EXTRA_LDFLAGS)
++
+ # zero
+ ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
+   ifeq ($(ARCH_DATA_MODEL), 64)
diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make
new file mode 100644
index 00000000000..5ff779bb59c
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_jsig.make
@@ -0,0 +1,13 @@
+$NetBSD: patch-hotspot_make_bsd_makefiles_jsig.make,v 1.1 2017/07/24 12:27:33 wiz Exp $
+
+--- hotspot/make/bsd/makefiles/jsig.make.orig	2017-04-27 09:45:08.000000000 +0000
++++ hotspot/make/bsd/makefiles/jsig.make
+@@ -52,7 +52,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
+ # 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/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_saproc.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_saproc.make
new file mode 100644
index 00000000000..75851a4173f
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_saproc.make
@@ -0,0 +1,21 @@
+$NetBSD: patch-hotspot_make_bsd_makefiles_saproc.make,v 1.1 2017/07/24 12:27:33 wiz Exp $
+
+--- hotspot/make/bsd/makefiles/saproc.make.orig	2017-04-27 09:45:08.000000000 +0000
++++ hotspot/make/bsd/makefiles/saproc.make
+@@ -107,7 +107,6 @@ ifneq ($(filter-out ia64 arm zero,$(SRCA
+ endif
+ endif
+ 
+-
+ ifneq ($(OS_VENDOR), Darwin)
+ SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE))
+ else
+@@ -116,6 +115,8 @@ SA_LFLAGS = $(LFLAGS)
+ endif
+ SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
+ 
++SA_LFLAGS += $(EXTRA_LDFLAGS)
++
+ BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
+   -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
+