changeset 2314:3693eed0618e

Merge
author erikj
date Thu, 10 Mar 2016 19:20:24 +0100
parents e654b42015f9 b0d82bafd78d
children f84403709ae3
files .hgtags common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/conf/jib-profiles.js make/common/MakeBase.gmk
diffstat 6 files changed, 19 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Mar 10 18:53:25 2016 +0100
+++ b/.hgtags	Thu Mar 10 19:20:24 2016 +0100
@@ -351,3 +351,5 @@
 be58b02c11f90b88c67e4d0e2cb5e4cf2d9b3c57 jdk-9+105
 54575d8783b3a39a2d710c28cda675d44261f9d9 jdk-9+106
 4d65eba233a8730f913734a6804910b842d2cb54 jdk-9+107
+c7be2a78c31b3b6132f2f5e9e4b3d3bb1c20245c jdk-9+108
+1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109
--- a/common/autoconf/flags.m4	Thu Mar 10 18:53:25 2016 +0100
+++ b/common/autoconf/flags.m4	Thu Mar 10 19:20:24 2016 +0100
@@ -924,10 +924,6 @@
       # Non-zero builds have stricter warnings
       JVM_CFLAGS="$JVM_CFLAGS -Wreturn-type -Wundef -Wformat=2"
     else
-      # Suppress some warning flags that are normally turned on for hotspot,
-      # because some of the zero code has not been updated accordingly.
-      JVM_CFLAGS="$JVM_CFLAGS -Wno-return-type -Wno-format-nonliteral \
-          -Wno-format-security -Wno-maybe-uninitialized"
       if test "x$TOOLCHAIN_TYPE" = xclang; then
         # Some versions of llvm do not like -Wundef
         JVM_CFLAGS="$JVM_CFLAGS -Wno-undef"
--- a/common/autoconf/generated-configure.sh	Thu Mar 10 18:53:25 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Thu Mar 10 19:20:24 2016 +0100
@@ -4941,7 +4941,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1457632018
+DATE_WHEN_GENERATED=1457632864
 
 ###############################################################################
 #
@@ -47219,10 +47219,6 @@
       # Non-zero builds have stricter warnings
       JVM_CFLAGS="$JVM_CFLAGS -Wreturn-type -Wundef -Wformat=2"
     else
-      # Suppress some warning flags that are normally turned on for hotspot,
-      # because some of the zero code has not been updated accordingly.
-      JVM_CFLAGS="$JVM_CFLAGS -Wno-return-type -Wno-format-nonliteral \
-          -Wno-format-security -Wno-maybe-uninitialized"
       if test "x$TOOLCHAIN_TYPE" = xclang; then
         # Some versions of llvm do not like -Wundef
         JVM_CFLAGS="$JVM_CFLAGS -Wno-undef"
--- a/make/Images.gmk	Thu Mar 10 18:53:25 2016 +0100
+++ b/make/Images.gmk	Thu Mar 10 19:20:24 2016 +0100
@@ -42,7 +42,7 @@
                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
                jdk.accessibility jdk.internal.le jdk.dynalink \
                jdk.scripting.nashorn jdk.scripting.nashorn.shell \
-               jdk.vm.ci jdk.management
+               jdk.vm.ci jdk.management jdk.jsobject
 
 # providers
 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.jvmstat.rmi \
--- a/make/common/MakeBase.gmk	Thu Mar 10 18:53:25 2016 +0100
+++ b/make/common/MakeBase.gmk	Thu Mar 10 19:20:24 2016 +0100
@@ -282,7 +282,7 @@
     # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
     # Only use time if it's GNU time which supports format and output file.
     WRAPPER_SHELL := $$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(SHELL)
-    SHELL := $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
+    SHELL = $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
   endif
   # The warn level can never be turned off
   LogWarn = $$(info $$(strip $$1))
--- a/modules.xml	Thu Mar 10 18:53:25 2016 +0100
+++ b/modules.xml	Thu Mar 10 19:20:24 2016 +0100
@@ -844,6 +844,18 @@
     </export>
   </module>
   <module>
+    <name>jdk.jsobject</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.desktop</depend>
+    <export>
+      <name>netscape.javascript</name>
+    </export>
+    <export>
+      <name>jdk.internal.netscape.javascript.spi</name>
+      <to>jdk.plugin</to>
+    </export>
+  </module>
+  <module>
     <name>java.httpclient</name>
     <depend>java.base</depend>
     <export>
@@ -1802,10 +1814,10 @@
       <name>com.sun.tools.javadoc</name>
     </export>
     <export>
-      <name>jdk.javadoc.doclet</name>  
+      <name>jdk.javadoc.doclet</name>
     </export>
     <export>
-      <name>jdk.javadoc.doclet.taglet</name>  
+      <name>jdk.javadoc.doclet.taglet</name>
     </export>
   </module>
   <module>