Mercurial > hg > icedtea8

changeset 2845:378ad9776199

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump shenandoah to aarch64-shenandoah-jdk8u181-b15. Upstream changes: - Fix hang on AArch64 - S8038636: speculative traps break when classes are redefined - S8055008: Clean up code that saves the previous versions of redefined classes - S8057570: RedefineClasses() tests fail assert(((Metadata*)obj)->is_valid()) failed: obj is valid - S8078628: linux-zero does not build without precompiled header - S8156137: SIGSEGV in ReceiverTypeData::clean_weak_klass_links - S8169201: Montgomery multiply intrinsic should use correct name - S8187045: [linux] Not all libraries in the VM are linked with -z,noexecstack - S8187577: JVM crash during gc doing concurrent marking - S8188223: IfNode::range_check_trap_proj() should handler dying subgraph with single if proj - S8198794: Hotspot crash on Cassandra 3.11.1 startup with libnuma 2.0.3 - S8199406: Performance drop with Java JDK 1.8.0_162-b32 - S8204874: Update THIRDPARYREADME file - S8207348: AArch64: backport 8207345: Trampoline generation code reads from uninitialized memory - UB in os_linux_aarch64.cpp SpinPause ChangeLog: 2018-09-10 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump shenandoah to aarch64-shenandoah-jdk8u181-b15. * patches/hotspot/shenandoah/8078628-pr3208.patch: Removed as applied upstream in 8u181. * Makefile.am: Move 8078628-pr3208.patch to AArch32-only section as the only HotSpot build not on 8u181. * NEWS: Updated. * hotspot.map.in: Bump shenandoah to aarch64-shenandoah-jdk8u181-b15. * patches/hotspot/aarch32/pr3539-rh1548475.patch: Replace symlink with a copy of the old version. * patches/hotspot/shenandoah/pr3539-rh1548475.patch: Updated to apply against 8u181.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 10 Sep 2018 19:20:41 +0100
parents b12e6e586295
children a71ed6325859
files ChangeLog Makefile.am NEWS hotspot.map.in patches/hotspot/aarch32/pr3539-rh1548475.patch patches/hotspot/shenandoah/8078628-pr3208.patch patches/hotspot/shenandoah/pr3539-rh1548475.patch
diffstat 7 files changed, 165 insertions(+), 147 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Sep 09 14:26:05 2018 +0100
+++ b/ChangeLog	Mon Sep 10 19:20:41 2018 +0100
@@ -1,3 +1,20 @@
+2018-09-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump shenandoah to
+	aarch64-shenandoah-jdk8u181-b15.
+	* patches/hotspot/shenandoah/8078628-pr3208.patch:
+	Removed as applied upstream in 8u181.
+	* Makefile.am:
+	Move 8078628-pr3208.patch to AArch32-only section
+	as the only HotSpot build not on 8u181.
+	* NEWS: Updated.
+	* hotspot.map.in: Bump shenandoah to
+	aarch64-shenandoah-jdk8u181-b15.
+	* patches/hotspot/aarch32/pr3539-rh1548475.patch:
+	Replace symlink with a copy of the old version.
+	* patches/hotspot/shenandoah/pr3539-rh1548475.patch:
+	Updated to apply against 8u181.
+
 2018-09-05  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-3.9.0.
--- a/Makefile.am	Sun Sep 09 14:26:05 2018 +0100
+++ b/Makefile.am	Mon Sep 10 19:20:41 2018 +0100
@@ -353,6 +353,7 @@
 if WITH_AARCH32_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/pr3548-aarch32.patch \
+	patches/hotspot/$(HSBUILD)/8078628-pr3208.patch \
 	patches/hotspot/$(HSBUILD)/8165489-pr3589.patch \
 	patches/hotspot/$(HSBUILD)/8187577-pr3578.patch
 endif
@@ -372,7 +373,6 @@
 	patches/hotspot/$(HSBUILD)/pr1975.patch \
 	patches/hotspot/$(HSBUILD)/pr2777.patch \
 	patches/hotspot/$(HSBUILD)/werror.patch \
-	patches/hotspot/$(HSBUILD)/8078628-pr3208.patch \
 	patches/hotspot/$(HSBUILD)/8141491-pr3159-g592292.patch \
 	patches/hotspot/$(HSBUILD)/8043780-pr3368.patch \
 	patches/hotspot/$(HSBUILD)/8187667-pr3517-readdir_r.patch \
--- a/NEWS	Sun Sep 09 14:26:05 2018 +0100
+++ b/NEWS	Mon Sep 10 19:20:41 2018 +0100
@@ -313,6 +313,7 @@
   - StringInternCleanup times out
   - VerifyJCStressTest should test all heuristics
   - Workaround VM crash with JNI Weak Refs handling
+  - S8207348: AArch64: backport 8207345: Trampoline generation code reads from uninitialized memory
 
 New in release 3.8.0 (2018-05-29):
 
--- a/hotspot.map.in	Sun Sep 09 14:26:05 2018 +0100
+++ b/hotspot.map.in	Mon Sep 10 19:20:41 2018 +0100
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
 default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 16ee3c35fef2 afd62ca7af0af93ab3cdad29ade1b90dfb39d3443884f382b3a817a26e21c3f4
-shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 923b7475c897 509febb41f786879c091500ec98e6a8dfbca16e419b2bbdcaecb7f522558cae5
+shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ b8b742251e42 551e84e3477a777867c56023203ea73f10b4ebfb3fd1c0fe84302abcdb5f08e6
 aarch32 drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ e749b2f34b5e f69d992385d607b46ddb78373f7964c1a3b30f95c809e4669b804cf2f0f137ad
--- a/patches/hotspot/aarch32/pr3539-rh1548475.patch	Sun Sep 09 14:26:05 2018 +0100
+++ b/patches/hotspot/aarch32/pr3539-rh1548475.patch	Mon Sep 10 19:20:41 2018 +0100
@@ -1,1 +1,116 @@
-../shenandoah/pr3539-rh1548475.patch
\ No newline at end of file
+# HG changeset patch
+# User andrew
+# Date 1526065930 -3600
+#      Fri May 11 20:12:10 2018 +0100
+# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
+# Parent  afb31413c73cbc06420fdb447aa90a7a38258904
+PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
+
+diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
++++ openjdk/hotspot/make/aix/makefiles/jsig.make
+@@ -45,7 +45,7 @@
+ # 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 openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
++++ openjdk/hotspot/make/aix/makefiles/saproc.make
+@@ -66,7 +66,7 @@
+ 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 openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
+--- openjdk.orig/hotspot/make/aix/makefiles/vm.make
++++ openjdk/hotspot/make/aix/makefiles/vm.make
+@@ -117,7 +117,7 @@
+ 
+ # 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 openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
++++ openjdk/hotspot/make/bsd/makefiles/jsig.make
+@@ -52,7 +52,7 @@
+ # 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 openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
++++ openjdk/hotspot/make/bsd/makefiles/saproc.make
+@@ -114,7 +114,7 @@
+ # 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 openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
++++ openjdk/hotspot/make/bsd/makefiles/vm.make
+@@ -119,7 +119,7 @@
+ 
+ # 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 openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
++++ openjdk/hotspot/make/linux/makefiles/jsig.make
+@@ -44,7 +44,7 @@
+ # 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)
+ 
+ # DEBUG_BINARIES overrides everything, use full -g debug information
+ ifeq ($(DEBUG_BINARIES), true)
+diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -73,7 +73,7 @@
+ else
+ ALT_SAINCDIR=
+ endif
+-SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
++SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
+ 
+ SAARCH ?= $(BUILDARCH)
+ 
+diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make
++++ openjdk/hotspot/make/linux/makefiles/vm.make
+@@ -130,7 +130,7 @@
+ 
+ # 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
--- a/patches/hotspot/shenandoah/8078628-pr3208.patch	Sun Sep 09 14:26:05 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1477430205 -3600
-#      Tue Oct 25 22:16:45 2016 +0100
-# Node ID 3e73be729f73e0466652abea2fa205cf196e9941
-# Parent  e200581a7a13d2a96d31c79d3f17eee799f83608
-8078628, PR3208: Zero build fails with pre-compiled headers disabled
-
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp	2017-12-20 04:22:04.000000000 +0000
-+++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp	2018-01-10 17:26:06.988054364 +0000
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2008, 2009, 2010 Red Hat, Inc.
-+ * Copyright 2016 Red Hat, Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -26,6 +26,8 @@
- #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
- #define CPU_ZERO_VM_ENTRY_ZERO_HPP
- 
-+#include "interpreter/cppInterpreter.hpp"
-+
- class ZeroEntry {
-  public:
-   ZeroEntry() {
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp	2017-12-20 04:22:04.000000000 +0000
-+++ openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp	2018-01-10 17:26:06.988054364 +0000
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2011 Red Hat, Inc.
-+ * Copyright 2016 Red Hat, Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -23,6 +23,8 @@
-  *
-  */
- 
-+#ifndef CPU_ZERO_VM_METHODHANDLES_ZERO_HPP
-+#define CPU_ZERO_VM_METHODHANDLES_ZERO_HPP
- 
- // Adapters
- enum /* platform_dependent_constants */ {
-@@ -37,3 +39,5 @@
-   static int method_handle_entry_linkToVirtual(Method* method, intptr_t UNUSED, TRAPS);
-   static int method_handle_entry_linkToInterface(Method* method, intptr_t UNUSED, TRAPS);
-   static int method_handle_entry_invalid(Method* method, intptr_t UNUSED, TRAPS);
-+
-+#endif // CPU_ZERO_VM_METHODHANDLES_ZERO_HPP
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	2017-12-20 04:22:04.000000000 +0000
-+++ openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	2018-01-10 17:26:06.988054364 +0000
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2008 Red Hat, Inc.
-+ * Copyright 2016 Red Hat, Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -25,6 +25,7 @@
- 
- #include "precompiled.hpp"
- #include "assembler_zero.inline.hpp"
-+#include "entry_zero.hpp"
- #include "memory/resourceArea.hpp"
- #include "nativeInst_zero.hpp"
- #include "oops/oop.inline.hpp"
-diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp
---- openjdk.orig/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp	2017-12-20 04:22:04.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp	2018-01-10 17:26:06.988054364 +0000
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright 2016 Red Hat, Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -28,6 +29,10 @@
- // This file contains the platform-independent parts
- // of the template interpreter generator.
- 
-+#ifdef TARGET_ARCH_zero
-+#include "entry_zero.hpp"
-+#endif
-+
- #ifdef CC_INTERP
- 
- class CppInterpreterGenerator: public AbstractInterpreterGenerator {
-diff -Nru openjdk.orig/hotspot/src/share/vm/prims/methodHandles.hpp openjdk/hotspot/src/share/vm/prims/methodHandles.hpp
---- openjdk.orig/hotspot/src/share/vm/prims/methodHandles.hpp	2017-12-20 04:22:04.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/prims/methodHandles.hpp	2018-01-10 17:26:25.167763087 +0000
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright 2016 Red Hat, Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -31,6 +32,10 @@
- #include "runtime/globals.hpp"
- #include "runtime/interfaceSupport.hpp"
- 
-+#ifdef TARGET_ARCH_zero
-+#include "entry_zero.hpp"
-+#endif
-+
- class MacroAssembler;
- class Label;
- 
--- a/patches/hotspot/shenandoah/pr3539-rh1548475.patch	Sun Sep 09 14:26:05 2018 +0100
+++ b/patches/hotspot/shenandoah/pr3539-rh1548475.patch	Mon Sep 10 19:20:41 2018 +0100
@@ -6,9 +6,9 @@
 # Parent  afb31413c73cbc06420fdb447aa90a7a38258904
 PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
 
-diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
-+++ openjdk/hotspot/make/aix/makefiles/jsig.make
+diff -Nru openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/aix/makefiles/jsig.make	2018-09-10 16:45:58.782316574 +0100
++++ openjdk/hotspot/make/aix/makefiles/jsig.make	2018-09-10 16:55:19.785492708 +0100
 @@ -45,7 +45,7 @@
  # cause problems with interposing. See CR: 6466665
  # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
@@ -18,9 +18,9 @@
  
  LFLAGS_JSIG += $(BIN_UTILS)
  
-diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
-+++ openjdk/hotspot/make/aix/makefiles/saproc.make
+diff -Nru openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/aix/makefiles/saproc.make	2018-09-10 16:45:58.782316574 +0100
++++ openjdk/hotspot/make/aix/makefiles/saproc.make	2018-09-10 16:55:19.785492708 +0100
 @@ -66,7 +66,7 @@
  endif
  
@@ -30,9 +30,9 @@
  
  $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
  	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
+diff -Nru openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
+--- openjdk.orig/hotspot/make/aix/makefiles/vm.make	2018-09-10 16:45:58.782316574 +0100
++++ openjdk/hotspot/make/aix/makefiles/vm.make	2018-09-10 16:55:19.785492708 +0100
 @@ -117,7 +117,7 @@
  
  # Extra flags from gnumake's invocation or environment
@@ -42,9 +42,9 @@
  
  # Don't set excutable bit on stack segment
  # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
-+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make	2018-09-10 16:45:58.798316322 +0100
++++ openjdk/hotspot/make/bsd/makefiles/jsig.make	2018-09-10 16:55:19.785492708 +0100
 @@ -52,7 +52,7 @@
  # cause problems with interposing. See CR: 6466665
  # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
@@ -54,9 +54,9 @@
  
  # DEBUG_BINARIES overrides everything, use full -g debug information
  ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
-+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make	2018-09-10 16:45:58.798316322 +0100
++++ openjdk/hotspot/make/bsd/makefiles/saproc.make	2018-09-10 16:55:19.785492708 +0100
 @@ -114,7 +114,7 @@
  # bring in minimum version argument or we'll fail on OSX 10.10
  SA_LFLAGS = $(LFLAGS)
@@ -66,9 +66,9 @@
  
  BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
    -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/vm.make	2018-09-10 16:45:58.798316322 +0100
++++ openjdk/hotspot/make/bsd/makefiles/vm.make	2018-09-10 16:55:19.785492708 +0100
 @@ -119,7 +119,7 @@
  
  # Extra flags from gnumake's invocation or environment
@@ -78,21 +78,21 @@
  
  # Don't set excutable bit on stack segment
  # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make	2018-09-10 16:45:58.798316322 +0100
++++ openjdk/hotspot/make/linux/makefiles/jsig.make	2018-09-10 16:55:45.461088863 +0100
 @@ -44,7 +44,7 @@
  # 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 += -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 openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make	2018-09-10 16:45:58.798316322 +0100
++++ openjdk/hotspot/make/linux/makefiles/saproc.make	2018-09-10 16:55:19.785492708 +0100
 @@ -73,7 +73,7 @@
  else
  ALT_SAINCDIR=
@@ -102,9 +102,9 @@
  
  SAARCH ?= $(BUILDARCH)
  
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2018-09-10 16:45:58.834315755 +0100
++++ openjdk/hotspot/make/linux/makefiles/vm.make	2018-09-10 16:55:19.785492708 +0100
 @@ -130,7 +130,7 @@
  
  # Extra flags from gnumake's invocation or environment