Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoramurillo
Tue, 15 Dec 2015 19:01:07 -0800
changeset 34677 cfc6dff3775d
parent 34676 0757afec840b (current diff)
parent 34610 0d0012bed22c (diff)
child 34678 329bff8000d4
Merge
--- a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Fri Dec 11 17:45:48 2015 -0800
+++ b/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Tue Dec 15 19:01:07 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
jdk-sandbox