Mercurial > hg > icedtea8-forest > jdk
changeset 6266:26dbd73fb766 jdk8-b64
Merge
author | katleman |
---|---|
date | Wed, 07 Nov 2012 15:39:07 -0800 |
parents | 6ffd64541a6c (current diff) 63726e5b90da (diff) |
children | ad5c1d6b1e16 3717bcf9d7a7 |
files | makefiles/CompileJavaClasses.gmk makefiles/CompileNativeLibraries.gmk makefiles/CreateJars.gmk |
diffstat | 4 files changed, 12 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/CompileJavaClasses.gmk Fri Nov 02 17:44:31 2012 -0700 +++ b/makefiles/CompileJavaClasses.gmk Wed Nov 07 15:39:07 2012 -0800 @@ -407,12 +407,11 @@ 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
--- a/makefiles/CompileNativeLibraries.gmk Fri Nov 02 17:44:31 2012 -0700 +++ b/makefiles/CompileNativeLibraries.gmk Wed Nov 07 15:39:07 2012 -0800 @@ -1078,7 +1078,7 @@ 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_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 @@ $(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 @@ 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 @@ $(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 @@ 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 @@ 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 \
--- a/makefiles/CreateJars.gmk Fri Nov 02 17:44:31 2012 -0700 +++ b/makefiles/CreateJars.gmk Wed Nov 07 15:39:07 2012 -0800 @@ -162,15 +162,7 @@ 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 @@ 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 \
--- a/makefiles/GensrcJObjC.gmk Fri Nov 02 17:44:31 2012 -0700 +++ b/makefiles/GensrcJObjC.gmk Wed Nov 07 15:39:07 2012 -0800 @@ -41,7 +41,6 @@ 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 @@ # 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) $@