Merge

makefiles/CompileJavaClasses.gmk

@@ -407,12 +407,11 @@ $(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS_JAR,\
 		INCLUDES := com/apple/jobjc,\
                 EXCLUDES := tests/java/com/apple/jobjc,\
 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\
-		JAR:=$(JDK_OUTPUTDIR)/jobjc_classes_headers/dummy.jar, \
-		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers))
+		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
 
 $(BUILD_JOBJC_HEADERS_JAR) : $(BUILD_JDK)
 
-JARS += $(JDK_OUTPUTDIR)/jobjc_classes_headers/dummy.jar
+JARS += $(BUILD_JOBJC_HEADERS_JAR)
 
 endif
 

makefiles/CompileNativeLibraries.gmk

@@ -1078,7 +1078,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET,\
 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
 			 $(call SET_SHARED_LIBRARY_ORIGIN), \
 		LDFLAGS_SUFFIX_linux:=-lpthread,\
-		LDFLAGS_SUFFIX_solaris:=-lnsl -lsocket,\
+		LDFLAGS_SUFFIX_solaris:=-lnsl -lsocket -lc,\
 		LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib,\
 		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
 		RC_FLAGS:=$(RC_FLAGS)\
@@ -1717,7 +1717,7 @@ BUILD_LIBHPROF_CFLAGS:=-I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
 BUILD_LIBHPROF_LDFLAGS:=
 
 ifeq ($(OPENJDK_TARGET_OS),solaris)
-     BUILD_LIBHPROF_LDFLAGS += -lsocket -lnsl
+     BUILD_LIBHPROF_LDFLAGS += -lsocket -lnsl -lc
 endif
 
 LIBHPROF_OPTIMIZATION:=HIGHEST
@@ -1794,6 +1794,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNPT,\
 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
 		LDFLAGS_macosx:=-liconv,\
 		LDFLAGS_SUFFIX_windows:=-export:nptInitialize -export:nptTerminate,\
+		LDFLAGS_SUFFIX_solaris:=-lc, \
 		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
 		RC_FLAGS:=$(RC_FLAGS)\
 			  -D "JDK_FNAME=npt.dll" \
@@ -1849,7 +1850,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET,\
 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
 		LDFLAGS_SUFFIX_macosx:=-ljvm -ljava,\
-		LDFLAGS_SUFFIX_solaris:=-ljvm -ljava -lnsl -lsocket $(LIBDL) ,\
+		LDFLAGS_SUFFIX_solaris:=-ljvm -ljava -lnsl -lsocket $(LIBDL) -lc ,\
 		LDFLAGS_SUFFIX_linux:=$(LIBDL) -ljvm -lpthread -ljava,\
 		LDFLAGS_SUFFIX_windows:=ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
 					delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
@@ -2035,7 +2036,7 @@ ifeq ($(OPENJDK_TARGET_OS_API),posix)
 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
 		LDFLAGS_SUFFIX_linux:=-lpthread $(LIBDL) -ljava -ljvm,\
 		LDFLAGS_SUFFIX_posix:=-lnio -lnet,\
-		LDFLAGS_SUFFIX_solaris:=-lsocket -ljava -ljvm,\
+		LDFLAGS_SUFFIX_solaris:=-lsocket -ljava -ljvm -lc,\
 		LDFLAGS_SUFFIX_macosx:=-ljava -ljvm,\
 		INCLUDE_FILES:=SctpNet.c SctpChannelImpl.c SctpServerChannelImpl.c,\
 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsctp))
@@ -3404,7 +3405,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC32,\
 		CFLAGS:=-fpascal-strings \
                         -fobjc-gc \
                         -gdwarf-2 \
-                        $(CFLAGS_JDKLIB) \
+                        $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
                         -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
 			-m32,\
 		LDFLAGS:=$(LDFLAGS_JDKLIB)\
@@ -3425,7 +3426,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64,\
 		CFLAGS:=-fpascal-strings \
                         -fobjc-gc \
                         -gdwarf-2 \
-                        $(CFLAGS_JDKLIB) \
+                        $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
                         -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
 			, \
 		LDFLAGS:=-fpascal-strings \

makefiles/CreateJars.gmk

@@ -162,15 +162,7 @@ RT_JAR_EXCLUDES := \
 	sun/tools/serialver \
 	sun/tools/tree \
 	sun/tools/util \
-	sun/security/tools/jarsigner/JarBASE64Encoder.class \
-	sun/security/tools/jarsigner/Main.class \
-	sun/security/tools/jarsigner/JarSignerParameters.class \
-	sun/security/tools/jarsigner/Resources.class \
-	sun/security/tools/jarsigner/Resources_ja.class \
-	sun/security/tools/jarsigner/Resources_zh_CN.class \
-	sun/security/tools/jarsigner/SignatureFile\$$$$Block.class \
-	sun/security/tools/jarsigner/SignatureFile.class \
-	sun/security/tools/jarsigner/TimestampedSigner.class \
+	sun/security/tools/jarsigner \
 	sun/security/provider/Sun.class \
 	sun/security/rsa/SunRsaSign.class \
 	sun/security/ssl \
@@ -701,14 +693,7 @@ TOOLS_JAR_INCLUDES := \
 	sun/tools/serialver	\
 	sun/tools/tree		\
 	sun/tools/util		\
-	sun/security/tools/JarBASE64Encoder.class \
-	sun/security/tools/JarSigner.class \
-	sun/security/tools/JarSignerParameters.class \
-	sun/security/tools/JarSignerResources.class \
-	sun/security/tools/JarSignerResources_ja.class \
-	sun/security/tools/JarSignerResources_zh_CN.class \
-	sun/security/tools/SignatureFile* \
-	sun/security/tools/TimestampedSigner.class \
+	sun/security/tools/jarsigner \
 	sun/rmi/rmic		\
 	sun/applet		\
 	sun/jvmstat		\

makefiles/GensrcJObjC.gmk

@@ -41,7 +41,6 @@ $(eval $(call SetupJavaCompilation,BUILD_JOBJC_PRIMITIVE_CODER,\
 		DISABLE_SJAVAC:=true,\
 		INCLUDES:=core/java \
                           com/apple,\
-                HEADERS:=$(JOBJC_DST)/jni_headers/core ,\
 		SRC:=$(JOBJC_SRC)/src \
                      $(JOBJC_SRC)/src/generator/java, \
 		BIN:=$(JOBJC_TMP)/bin))
@@ -97,10 +96,8 @@ $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
 # Run generator
 #    Now we use bootclasspath to run java again, with the bridge support to
 #    generate more source.
-#    Note the use of the | (order-only) on the BRIDGESUPPORT, should serialize
-#    them just in case GBM run in parallel has issues.
 #
-$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath | $(BRIDGESUPPORT)
+$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath $(BRIDGESUPPORT)
 	$(RM) $@
 	$(JAVA) $(LOG_INFO) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge
 	$(TOUCH) $@