Mercurial > hg > openjdk > jdk9 > hotspot

changeset 9808:e8d76ba3faa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author twisti
date Tue, 22 Dec 2015 13:41:09 -0800
parents 46122d93612d (current diff) 34135f009271 (diff)
children 946f85344998
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -499,3 +499,4 @@
 a22b7c80529f5f05c847e932e017456e83c46233 jdk9-b94
 0c79cf3cdf0904fc4a630b91b32904491e1ae430 jdk-9+95
 a94bb7203596dd632486f1e3655fa5f70541dc08 jdk-9+96
+de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97
--- a/make/lib/Lib-jdk.hotspot.agent.gmk	Mon Dec 21 22:17:23 2015 +0100
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk	Tue Dec 22 13:41:09 2015 -0800
@@ -71,7 +71,7 @@
       -DSOLARIS_11_B159_OR_LATER
   SA_CFLAGS := $(CFLAGS_JDKLIB) $(COMMON_CFLAGS)
   SA_CXXFLAGS := $(CXXFLAGS_JDKLIB) $(COMMON_CFLAGS)
-  SA_LDFLAGS := $(subst -z defs,, $(LDFLAGS_JDKLIB)) \
+  SA_LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,, $(LDFLAGS_JDKLIB)) \
       -mt $(LDFLAGS_CXX_JDK)
   SA_LIBS := -ldl -ldemangle -lthread -lc