Mercurial > hg > release > icedtea6-1.12

changeset 46:060cbbe62b5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-25 Francis Kung <fkung@redhat.com> * Makefile.am: Upgrade to OpenJDK b14. * generated/sun/util/CoreResourceBundleControl.java: Regenerated. * patches/icedtea-copy-plugs.patch: Update line numbers for b14. * patches/icedtea-ports.patch: Likewise. * patches/icedtea-speed.patch: Likewise. * patches/icedtea-gcc.patch: New file. * Makefile.in: Regenerated.
author Francis Kung <fkung@redhat.com>
date Mon, 25 Jun 2007 11:51:04 -0400
parents 1b691c29be89
children 9a4a49c97d0e
files ChangeLog Makefile.am Makefile.in generated/sun/util/CoreResourceBundleControl.java patches/icedtea-copy-plugs.patch patches/icedtea-gcc.patch patches/icedtea-ports.patch patches/icedtea-speed.patch
diffstat 8 files changed, 80 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 22 19:55:17 2007 -0400
+++ b/ChangeLog	Mon Jun 25 11:51:04 2007 -0400
@@ -1,3 +1,13 @@
+2007-06-25  Francis Kung  <fkung@redhat.com>
+
+	* Makefile.am: Upgrade to OpenJDK b14.
+	* generated/sun/util/CoreResourceBundleControl.java: Regenerated.
+	* patches/icedtea-copy-plugs.patch: Update line numbers for b14.
+	* patches/icedtea-ports.patch: Likewise.
+	* patches/icedtea-speed.patch: Likewise.
+	* patches/icedtea-gcc.patch: New file.
+	* Makefile.in: Regenerated.
+
 2007-06-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* .hgignore: Update.
--- a/Makefile.am	Fri Jun 22 19:55:17 2007 -0400
+++ b/Makefile.am	Mon Jun 25 11:51:04 2007 -0400
@@ -1,8 +1,8 @@
 EXTRA_DIST = rt jce generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH)
 
-OPENJDK_URL = http://www.java.net/download/openjdk/40ec4ed263a6dfce13b8cf18fa046058/jdk7/promoted/b13/
+OPENJDK_URL = http://download.java.net/openjdk/jdk7/promoted/b14/
 
-OPENJDK_MD5SUM = 9e6b27b7c1d7fee4bf149c7dea33517d
+OPENJDK_MD5SUM = c126a32966e4bdb6a60a5724d9447966
 
 if USE_CCACHE
   CCACHE_PATCH = patches/icedtea-ccache.patch
@@ -19,7 +19,7 @@
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP=$(ALT_OPENJDK_SRC_ZIP)
 else
-  OPENJDK_SRC_ZIP=openjdk-7-ea-src-b13-24_may_2007.zip
+  OPENJDK_SRC_ZIP=openjdk-7-ea-src-b14-21_jun_2007.zip
 endif
 
 ICEDTEA_PATCHES = \
@@ -29,6 +29,7 @@
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch \
+	patches/icedtea-gcc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
--- a/Makefile.in	Fri Jun 22 19:55:17 2007 -0400
+++ b/Makefile.in	Mon Jun 25 11:51:04 2007 -0400
@@ -173,13 +173,13 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = rt jce generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH)
-OPENJDK_URL = http://www.java.net/download/openjdk/40ec4ed263a6dfce13b8cf18fa046058/jdk7/promoted/b13/
-OPENJDK_MD5SUM = 9e6b27b7c1d7fee4bf149c7dea33517d
+OPENJDK_URL = http://download.java.net/openjdk/jdk7/promoted/b14/
+OPENJDK_MD5SUM = c126a32966e4bdb6a60a5724d9447966
 @USE_CCACHE_FALSE@CCACHE_PATCH = 
 @USE_CCACHE_TRUE@CCACHE_PATCH = patches/icedtea-ccache.patch
 @FAST_BUILD_FALSE@FAST_BUILD_PATCH = 
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
-@USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-7-ea-src-b13-24_may_2007.zip
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-7-ea-src-b14-21_jun_2007.zip
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE@OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
@@ -188,6 +188,7 @@
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch \
+	patches/icedtea-gcc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
--- a/generated/sun/util/CoreResourceBundleControl.java	Fri Jun 22 19:55:17 2007 -0400
+++ b/generated/sun/util/CoreResourceBundleControl.java	Mon Jun 25 11:51:04 2007 -0400
@@ -36,7 +36,7 @@
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
 
-/*
+/**
  * This is a convenient class for loading some of internal resources faster
  * if they are built with Resources.gmk defined in J2SE workspace. Also,
  * they have to be in class file format.
@@ -62,7 +62,7 @@
 	excludedJDKLocales = Arrays.asList(	Locale.GERMANY,	Locale.ENGLISH,	Locale.US, new Locale("es", "ES"),	Locale.FRANCE,	Locale.ITALY,	Locale.JAPAN,	Locale.KOREA, new Locale("sv", "SE"),	Locale.CHINESE);
     }
 
-    /*
+    /**
      * This method is to provide a customized ResourceBundle.Control to speed
      * up the search of resources in JDK.
      *
@@ -71,8 +71,27 @@
     public static CoreResourceBundleControl getRBControlInstance() {
 	return resourceBundleControlInstance;
     }
+
+    /**
+     * This method is to provide a customized ResourceBundle.Control to speed
+     * up the search of resources in JDK, with the bundle's package name check.
+     *
+     * @param bundleName bundle name to check
+     * @return the instance of resource bundle control if the bundle is JDK's,
+     *    otherwise returns null.
+     */
+    public static CoreResourceBundleControl getRBControlInstance(String bundleName) {
+        if (bundleName.startsWith("com.sun.") ||
+            bundleName.startsWith("java.") ||
+            bundleName.startsWith("javax.") ||
+            bundleName.startsWith("sun.")) {
+	    return resourceBundleControlInstance;
+	} else {
+            return null;
+	}
+    }
  
-    /*
+    /**
      * @returns a list of candidate locales to search from.
      * @exception NullPointerException if baseName or locale is null.
      */
@@ -83,7 +102,7 @@
 	return candidates;
     }
 
-    /*
+    /**
      * @ returns TTL_DONT_CACHE so that ResourceBundle instance won't be cached.
      * User of this CoreResourceBundleControl should probably maintain a hard reference
      * to the ResourceBundle object themselves.
--- a/patches/icedtea-copy-plugs.patch	Fri Jun 22 19:55:17 2007 -0400
+++ b/patches/icedtea-copy-plugs.patch	Mon Jun 25 11:51:04 2007 -0400
@@ -1,7 +1,7 @@
 diff -urN openjdk.orig/j2se/make/common/Release.gmk openjdk/j2se/make/common/Release.gmk
 --- openjdk.orig/j2se/make/common/Release.gmk	2007-05-24 03:33:20.000000000 -0400
 +++ openjdk/j2se/make/common/Release.gmk	2007-06-22 17:06:46.000000000 -0400
-@@ -273,6 +273,7 @@
+@@ -270,6 +270,7 @@
  
  
  CLOSED_CLASSES =  \
@@ -9,7 +9,7 @@
  sun/dc \
  java/awt/color/CMMException.class \
  java/awt/color/ColorSpace.class \
-@@ -309,8 +310,6 @@
+@@ -306,8 +307,6 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -18,7 +18,7 @@
  com/sun/jmx/snmp/SnmpOidRecord.class \
  com/sun/jmx/snmp/SnmpOidTable.class \
  com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -320,17 +319,9 @@
+@@ -317,17 +316,9 @@
  com/sun/jmx/snmp/SnmpTimeticks.class \
  com/sun/jmx/snmp/SnmpVarBind.class \
  com/sun/jmx/snmp/SnmpVarBindList.class \
@@ -50,7 +50,7 @@
 diff -urN openjdk.orig/j2se/make/java/redist/Makefile openjdk/j2se/make/java/redist/Makefile
 --- openjdk.orig/j2se/make/java/redist/Makefile	2007-05-24 03:33:21.000000000 -0400
 +++ openjdk/j2se/make/java/redist/Makefile	2007-06-22 17:07:08.000000000 -0400
-@@ -308,6 +308,7 @@
+@@ -312,6 +312,7 @@
  # that a local clobber and remake works.
  CLOSED_CLASSES =  \
  sun/dc \
@@ -58,7 +58,7 @@
  java/awt/color/CMMException.class \
  java/awt/color/ColorSpace.class \
  java/awt/color/ICC_ColorSpace.class \
-@@ -343,8 +344,6 @@
+@@ -347,8 +348,6 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -67,7 +67,7 @@
  com/sun/jmx/snmp/SnmpOidRecord.class \
  com/sun/jmx/snmp/SnmpOidTable.class \
  com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -354,17 +353,9 @@
+@@ -358,17 +357,9 @@
  com/sun/jmx/snmp/SnmpTimeticks.class \
  com/sun/jmx/snmp/SnmpVarBind.class \
  com/sun/jmx/snmp/SnmpVarBindList.class \
@@ -83,8 +83,8 @@
 -com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
 -com/sun/jmx/snmp/daemon/WaitQ.class \
  com/sun/media/sound
+
  build: openjdkredist
- openjdkredist:
 diff -urN openjdk.orig/j2se/make/tools/sharing/classlist.linux openjdk/j2se/make/tools/sharing/classlist.linux
 --- openjdk.orig/j2se/make/tools/sharing/classlist.linux	2007-05-24 03:33:25.000000000 -0400
 +++ openjdk/j2se/make/tools/sharing/classlist.linux	2007-06-22 17:06:14.000000000 -0400
@@ -110,7 +110,7 @@
 diff -urN openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
 --- openjdk.orig/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2007-05-24 03:41:34.000000000 -0400
 +++ openjdk/j2se/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2007-06-22 17:06:14.000000000 -0400
-@@ -1152,7 +1152,7 @@
+@@ -1154,7 +1154,7 @@
              Set<BitSet> getterIndexSets = newSet();
              for (Constructor constr : annotatedConstrList) {
                  String[] propertyNames =
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-gcc.patch	Mon Jun 25 11:51:04 2007 -0400
@@ -0,0 +1,27 @@
+diff -urN openjdk.orig/hotspot/src/share/vm/includeDB_gc_parallel openjdk/hotspot/src/share/vm/includeDB_gc_parallel
+--- openjdk.orig/hotspot/src/share/vm/includeDB_gc_parallel	2007-06-21 03:30:57.000000000 -0400
++++ openjdk/hotspot/src/share/vm/includeDB_gc_parallel	2007-06-22 16:21:23.000000000 -0400
+@@ -40,12 +40,15 @@
+ instanceKlass.cpp                       oop.pcgc.inline.hpp
+ instanceKlass.cpp                       psPromotionManager.inline.hpp
+ instanceKlass.cpp                       psScavenge.inline.hpp
++instanceKlass.cpp                       parOopClosures.inline.hpp
+ 
+ instanceKlassKlass.cpp                  psPromotionManager.inline.hpp
+ instanceKlassKlass.cpp                  psScavenge.inline.hpp
+ 
+ instanceRefKlass.cpp                    psPromotionManager.inline.hpp
++instanceRefKlass.cpp                    oop.pcgc.inline.hpp
+ instanceRefKlass.cpp                    psScavenge.inline.hpp
++instanceRefKlass.cpp                    parOopClosures.inline.hpp
+ 
+ java.cpp                                concurrentMarkSweepThread.hpp
+ java.cpp                                psScavenge.hpp
+@@ -77,6 +80,7 @@
+ objArrayKlass.cpp                       oop.pcgc.inline.hpp
+ objArrayKlass.cpp                       psPromotionManager.inline.hpp
+ objArrayKlass.cpp                       psScavenge.inline.hpp
++objArrayKlass.cpp                       parOopClosures.inline.hpp
+ 
+ oop.pcgc.inline.hpp                     parNewGeneration.hpp
+ oop.pcgc.inline.hpp                     parallelScavengeHeap.hpp
--- a/patches/icedtea-ports.patch	Fri Jun 22 19:55:17 2007 -0400
+++ b/patches/icedtea-ports.patch	Mon Jun 25 11:51:04 2007 -0400
@@ -241,7 +241,7 @@
 diff -r a208e9bbeafa hotspot/src/share/vm/utilities/macros.hpp
 --- openjdk/hotspot/src/share/vm/utilities/macros.hpp	Wed Jun 06 11:33:35 2007 +0100
 +++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	Wed Jun 06 13:36:06 2007 +0100
-@@ -149,6 +149,38 @@
+@@ -156,6 +156,38 @@
  #define NOT_SPARC(code) code
  #endif
  
@@ -431,7 +431,7 @@
 diff -r 1a5632baad6e hotspot/build/linux/makefiles/defs.make
 --- openjdk/hotspot/build/linux/makefiles/defs.make	Tue Jun 19 14:09:39 2007 +0100
 +++ openjdk/hotspot/build/linux/makefiles/defs.make	Wed Jun 20 08:58:29 2007 +0100
-@@ -124,22 +124,22 @@ MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(FUL
+@@ -122,22 +122,22 @@ MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(FUL
  # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
  VM_DEBUG=jvmg
  
--- a/patches/icedtea-speed.patch	Fri Jun 22 19:55:17 2007 -0400
+++ b/patches/icedtea-speed.patch	Mon Jun 25 11:51:04 2007 -0400
@@ -1,7 +1,7 @@
 diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
 --- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-05-24 03:33:20.000000000 -0400
 +++ openjdk/j2se/make/common/Defs-linux.gmk	2007-06-18 16:02:48.000000000 -0400
-@@ -103,6 +103,7 @@
+@@ -106,6 +106,7 @@
      _OPT = $(CC_LOWER_OPT)
      CPPFLAGS_DBG    += -DLOGGING 
  endif
@@ -28,7 +28,7 @@
 diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
 --- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-05-24 03:31:18.000000000 -0400
 +++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-06-18 18:02:39.000000000 -0400
-@@ -98,7 +96,7 @@
+@@ -96,7 +94,7 @@
  CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
  
  # The flags to use for an Optimized g++ build