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
authortwisti
Tue, 22 Dec 2015 13:41:09 -0800
changeset 35142 11e71310edae
parent 35141 3cddc2b46986 (current diff)
parent 35081 070c4f5b3569 (diff)
child 35143 33daaea9d5c2
Merge
--- a/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -339,3 +339,4 @@
 25a2cab05cfbe6034b71d9e72d64c65b0572ce63 jdk9-b94
 5ac6287ec71aafe021cc839d8bc828108d23aaba jdk-9+95
 139f19d70350238e15e107945cea75082b6380b3 jdk-9+96
+4edcff1b9a8875eb6380a2165dfec599e8e3f7c0 jdk-9+97
--- a/.hgtags-top-repo	Mon Dec 21 22:17:23 2015 +0100
+++ b/.hgtags-top-repo	Tue Dec 22 13:41:09 2015 -0800
@@ -339,3 +339,4 @@
 349488425abcaf3ff62f580007860b4b56875d10 jdk9-b94
 12a6fb4f070f8ca8fbca219ab9abf5da8908b317 jdk-9+95
 5582a79892596169ebddb3e2c2aa44939e4e3f40 jdk-9+96
+75c3897541ecb52ee16d001ea605b12971df7303 jdk-9+97
--- a/corba/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/corba/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -339,3 +339,4 @@
 61e9f509be0f78f0961477960f372b0533214bb8 jdk9-b94
 fd038e8a16eec80d0d6b337d74a582790ed4b3ee jdk-9+95
 feb1bd85d7990dcf5584ca9e53104269c01db006 jdk-9+96
+10a482b863582376d4ca229090334b23b05159fc jdk-9+97
--- a/hotspot/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/hotspot/.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/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Mon Dec 21 22:17:23 2015 +0100
+++ b/hotspot/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
 
--- a/jaxp/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/jaxp/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -339,3 +339,4 @@
 5e75b8a9c01bca09c56dec7539e44dc82090c7c2 jdk9-b94
 c8d0845877a811ab4350935892f826929359a3ff jdk-9+95
 1f3182529f2c474e5506955ccb3820cfa5822265 jdk-9+96
+9c107c050335d7ee63b2a8b38ca5d498f19713a2 jdk-9+97
--- a/jaxws/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/jaxws/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -342,3 +342,4 @@
 e8d15c61400c1682a7873e053d7b39efde0b79be jdk9-b94
 3e03ddaaac6585fa27e91596eb2a9a31e10bdcc9 jdk-9+95
 b55cebc47555293cf9c2aefb3bf63c56e847ab19 jdk-9+96
+7293db4716ee25b814e14f738b9acfb85700e3fa jdk-9+97
--- a/jdk/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/jdk/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -339,3 +339,4 @@
 559b626b01179420a94feb9c3d0f246970d2e3fa jdk9-b94
 8581faf0d474472e32f589bbc16db7eec912d83f jdk-9+95
 c021b855f51e572e63982654b17742cb1f814fb4 jdk-9+96
+fdd84b2265ddce7f50e084b7c8635189bba6f012 jdk-9+97
--- a/langtools/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/langtools/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -339,3 +339,4 @@
 8356d7a909a29f321e3eaf9d3c2bbc71648529e2 jdk9-b94
 c35ddcde581676275cfeff33e1a2b90b902593d9 jdk-9+95
 d2a44416cba39957ea231eedc2fb8aad7be1b30c jdk-9+96
+ae8cdc734bab4f19ef8babd2434dcf024672ad38 jdk-9+97
--- a/nashorn/.hgtags	Mon Dec 21 22:17:23 2015 +0100
+++ b/nashorn/.hgtags	Tue Dec 22 13:41:09 2015 -0800
@@ -330,3 +330,4 @@
 328932975c749ba7ae40cd5b63e3a7983b564936 jdk9-b94
 9d52f9bb589c4caa3617fe1cf11c72512ab8e973 jdk-9+95
 d52c09d5d98a81ee6102a25f662ec4b9ae614163 jdk-9+96
+2beaef2b6a880c0bff8c9f57ffca33477d647f8b jdk-9+97
jdk-sandbox