Changeset 406 for trunk/openjdk/jdk/make

Timestamp:

Dec 21, 2012, 10:37:13 AM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b27 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• jdk/make/com/sun/jmx/Makefile (modified) (2 diffs)
• jdk/make/common/shared/Compiler-gcc.gmk (modified) (1 diff)
• jdk/make/sun/Makefile (modified) (1 diff)
• jdk/make/sun/beans/Makefile (deleted)

trunk/openjdk/jdk/make/com/sun/jmx/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -99 +99 @@
 # org.omg.stub (6375696)
 # 
+# To ensure the latest stub generator files are picked up from corba repo
+# when available, we need to run with latest rmic version available. rmic 
+# launch tool not built at this stage but we can invoke via rmi class.
+
+RMIC_JAVA = $(OUTPUTDIR)/bin/java
+# need to treat 64bit solaris differently
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
+endif
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
+RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/java
+endif
+
+RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
         $(prep-target)

trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

@@ -123 +123 @@
   endif
   # Option used to create a shared library
-  SHARED_LIBRARY_FLAG = -shared -mimpure-text
+  SHARED_LIBRARY_FLAG = -shared
   SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
 

trunk/openjdk/jdk/make/sun/Makefile

@@ -65 +65 @@
           awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
           $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
-          font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
+          font jpeg cmm applet rmi $(JDBC_SUBDIR) \
           jawt text nio launcher management $(ORG_SUBDIR) \
           native2ascii serialver tools jconsole