Merge
authorduke
Wed, 05 Jul 2017 17:47:56 +0200
changeset 10160 41b658506149
parent 10159 a3a3c58b415c (diff)
parent 10153 ce3cbd445a96 (current diff)
child 10167 977e1335a46f
Merge
jdk/src/share/classes/java/lang/invoke/FilterGeneric.java
jdk/src/share/classes/java/lang/invoke/FilterOneArgument.java
jdk/src/share/classes/java/lang/invoke/FromGeneric.java
jdk/src/share/classes/java/lang/invoke/SpreadGeneric.java
jdk/src/share/classes/java/lang/invoke/ToGeneric.java
jdk/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java
jdk/src/share/native/java/lang/fdlibm/src/e_acosh.c
jdk/src/share/native/java/lang/fdlibm/src/e_gamma.c
jdk/src/share/native/java/lang/fdlibm/src/e_gamma_r.c
jdk/src/share/native/java/lang/fdlibm/src/e_j0.c
jdk/src/share/native/java/lang/fdlibm/src/e_j1.c
jdk/src/share/native/java/lang/fdlibm/src/e_jn.c
jdk/src/share/native/java/lang/fdlibm/src/e_lgamma.c
jdk/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c
jdk/src/share/native/java/lang/fdlibm/src/s_asinh.c
jdk/src/share/native/java/lang/fdlibm/src/s_erf.c
jdk/src/share/native/java/lang/fdlibm/src/w_acosh.c
jdk/src/share/native/java/lang/fdlibm/src/w_gamma.c
jdk/src/share/native/java/lang/fdlibm/src/w_gamma_r.c
jdk/src/share/native/java/lang/fdlibm/src/w_j0.c
jdk/src/share/native/java/lang/fdlibm/src/w_j1.c
jdk/src/share/native/java/lang/fdlibm/src/w_jn.c
jdk/src/share/native/java/lang/fdlibm/src/w_lgamma.c
jdk/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c
jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/InterruptedIO.java
--- a/corba/.hgtags	Wed Jul 05 17:47:52 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 17:47:56 2017 +0200
@@ -121,3 +121,4 @@
 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
+73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
--- a/corba/.jcheck/conf	Wed Jul 05 17:47:52 2017 +0200
+++ b/corba/.jcheck/conf	Wed Jul 05 17:47:56 2017 +0200
@@ -1,1 +1,1 @@
-project=jdk7
+project=jdk8
--- a/corba/make/jprt.properties	Wed Jul 05 17:47:52 2017 +0200
+++ b/corba/make/jprt.properties	Wed Jul 05 17:47:56 2017 +0200
@@ -25,12 +25,23 @@
 
 # Properties for jprt
 
-# Use whatever release that the submitted job requests
-jprt.tools.default.release=${jprt.submit.release}
+# The release to build
+jprt.tools.default.release=jdk8
 
 # The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug
 
+# Standard list of jprt build targets for this source tree
+jprt.build.targets= 						\
+    solaris_sparc_5.10-{product|fastdebug}, 			\
+    solaris_sparcv9_5.10-{product|fastdebug}, 			\
+    solaris_i586_5.10-{product|fastdebug}, 			\
+    solaris_x64_5.10-{product|fastdebug}, 			\
+    linux_i586_2.6-{product|fastdebug}, 			\
+    linux_x64_2.6-{product|fastdebug}, 				\
+    windows_i586_5.1-{product|fastdebug}, 			\
+    windows_x64_5.2-{product|fastdebug}
+
 # Directories to be excluded from the source bundles
 jprt.bundle.exclude.src.dirs=build dist webrev