# HG changeset patch
# User duke
# Date 1499285169 -7200
# Node ID 356d392f403e1f585b5f581349f5c1150f5ebe98
# Parent  cf75dd18b3cdfd52a7a9f6c4d346b43c09e87d8b# Parent  3d8b2db865d723f059cba0a1b7f269a1bd6b5afc
Merge

diff -r cf75dd18b3cd -r 356d392f403e .hgtags-top-repo
--- a/.hgtags-top-repo	Fri Aug 19 11:22:14 2016 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 22:06:09 2017 +0200
@@ -374,3 +374,4 @@
 f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129
 d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
 8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131
+a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
diff -r cf75dd18b3cd -r 356d392f403e common/autoconf/spec.gmk.in
--- a/common/autoconf/spec.gmk.in	Fri Aug 19 11:22:14 2016 -0700
+++ b/common/autoconf/spec.gmk.in	Wed Jul 05 22:06:09 2017 +0200
@@ -251,8 +251,6 @@
 # Legacy support
 USE_NEW_HOTSPOT_BUILD:=@USE_NEW_HOTSPOT_BUILD@
 
-MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@
-
 # JDK_OUTPUTDIR specifies where a working jvm is built.
 # You can run $(JDK_OUTPUTDIR)/bin/java
 # Though the layout of the contents of $(JDK_OUTPUTDIR) is not
diff -r cf75dd18b3cd -r 356d392f403e make/common/Modules.gmk
--- a/make/common/Modules.gmk	Fri Aug 19 11:22:14 2016 -0700
+++ b/make/common/Modules.gmk	Wed Jul 05 22:06:09 2017 +0200
@@ -229,6 +229,7 @@
 	                       sub(/public/, ""); \
 	                       sub(/\/\/.*/, ""); \
 	                       sub(/\/\*.*\*\//, ""); \
+	                       gsub(/^ +\*.*/, ""); \
 	                       gsub(/ /, ""); \
 	                       printf(" %s", $$0) } \
 	          END        { printf("\n") }' $m \