changeset in /hg/icedtea6: 2008-07-21 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Mon Jul 21 13:49:29 PDT 2008
changeset 30aed052fabd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=30aed052fabd
description:
2008-07-21 Matthias Klose <doko at ubuntu.com>
* Update patches/icedtea-hotspot-6b11-7b24.patch.
* HACKING: Adjust.
diffstat:
5 files changed, 56983 insertions(+), 201227 deletions(-)
ChangeLog | 5
HACKING | 8
Makefile.am | 2
patches/icedtea-hotspot-6b06-7b24.patch |201222 -------------------------------
patches/icedtea-hotspot-6b11-7b24.patch |56973 ++++++++
diffs (truncated from 258247 to 500 lines):
diff -r 0645a8cd5783 -r 30aed052fabd ChangeLog
--- a/ChangeLog Mon Jul 21 22:25:14 2008 +0200
+++ b/ChangeLog Mon Jul 21 22:48:18 2008 +0200
@@ -1,3 +1,8 @@ 2008-07-21 Matthias Klose <doko at ubuntu
+2008-07-21 Matthias Klose <doko at ubuntu.com>
+
+ * Update patches/icedtea-hotspot-6b11-7b24.patch.
+ * HACKING: Adjust.
+
2008-07-21 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_GCJ): Add
diff -r 0645a8cd5783 -r 30aed052fabd HACKING
--- a/HACKING Mon Jul 21 22:25:14 2008 +0200
+++ b/HACKING Mon Jul 21 22:48:18 2008 +0200
@@ -84,12 +84,12 @@ The following patches are only applied f
* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
-* icedtea-hotspot-6b06-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
+* icedtea-hotspot-6b11-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
- Never edit this patch. It should be regenerated by unzipping the
openjdk6 build you're using into openjdk6, and the openjdk7 build
- you want to use into openjdk7, then running:
- diff -ruN openjdk[67]/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch
- diff -ruN openjdk[67]/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch
+ you want to use into openjdk, then running:
+ diff -ruNb openjdk{6,}/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch
+ diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch
* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
* icedtea-signature-iterator.patch: Add zero-specific signature handling.
diff -r 0645a8cd5783 -r 30aed052fabd Makefile.am
--- a/Makefile.am Mon Jul 21 22:25:14 2008 +0200
+++ b/Makefile.am Mon Jul 21 22:48:18 2008 +0200
@@ -335,7 +335,7 @@ endif
# If ZERO_BUILD is set then we are building zero and need
# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
ZERO_PATCHES = \
- patches/icedtea-hotspot-6b06-7b24.patch \
+ patches/icedtea-hotspot-6b11-7b24.patch \
patches/icedtea-hotspot7-build-fixes.patch \
patches/icedtea-bytecodeInterpreter.patch \
patches/icedtea-bytecodeInterpreterWithChecks.patch \
diff -r 0645a8cd5783 -r 30aed052fabd patches/icedtea-hotspot-6b06-7b24.patch
--- a/patches/icedtea-hotspot-6b06-7b24.patch Mon Jul 21 22:25:14 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,201222 +0,0 @@
-diff -ruN openjdk{6,}/hotspot/src/share
-diff -ruN openjdk{6,}/hotspot/src/os/linux
-
-diff -ruN openjdk6/hotspot/src/share/tools/MakeDeps/ArgsParser.java openjdk/hotspot/src/share/tools/MakeDeps/ArgsParser.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/ArgsParser.java 2008-02-28 05:02:31.000000000 -0500
-+++ openjdk/hotspot/src/share/tools/MakeDeps/ArgsParser.java 2008-01-31 09:19:00.000000000 -0500
-@@ -19,67 +19,67 @@
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
-- *
-+ *
- */
-
- class ArgIterator {
- String[] args;
- int i;
- ArgIterator(String[] args) {
-- this.args = args;
-- this.i = 0;
-+ this.args = args;
-+ this.i = 0;
- }
-- String get() { return args[i]; }
-+ String get() { return args[i]; }
- boolean hasMore() { return args != null && i < args.length; }
-- boolean next() { return ++i < args.length; }
-+ boolean next() { return ++i < args.length; }
- }
-
--abstract class ArgHandler {
-+abstract class ArgHandler {
- public abstract void handle(ArgIterator it);
--
-+
- }
-
- class ArgRule {
- String arg;
- ArgHandler handler;
- ArgRule(String arg, ArgHandler handler) {
-- this.arg = arg;
-- this.handler = handler;
-+ this.arg = arg;
-+ this.handler = handler;
- }
-
- boolean process(ArgIterator it) {
-- if (match(it.get(), arg)) {
-- handler.handle(it);
-- return true;
-- }
-- return false;
-+ if (match(it.get(), arg)) {
-+ handler.handle(it);
-+ return true;
-+ }
-+ return false;
- }
- boolean match(String rule_pattern, String arg) {
-- return arg.equals(rule_pattern);
-+ return arg.equals(rule_pattern);
- }
- }
-
- class ArgsParser {
-- ArgsParser(String[] args,
-- ArgRule[] rules,
-- ArgHandler defaulter) {
-- ArgIterator ai = new ArgIterator(args);
-- while (ai.hasMore()) {
-- boolean processed = false;
-- for (int i=0; i<rules.length; i++) {
-- processed |= rules[i].process(ai);
-- if (processed) {
-- break;
-- }
-- }
-- if (!processed) {
-- if (defaulter != null) {
-- defaulter.handle(ai);
-- } else {
-- System.err.println("ERROR: unparsed \""+ai.get()+"\"");
-- ai.next();
-- }
-- }
-- }
-+ ArgsParser(String[] args,
-+ ArgRule[] rules,
-+ ArgHandler defaulter) {
-+ ArgIterator ai = new ArgIterator(args);
-+ while (ai.hasMore()) {
-+ boolean processed = false;
-+ for (int i=0; i<rules.length; i++) {
-+ processed |= rules[i].process(ai);
-+ if (processed) {
-+ break;
-+ }
-+ }
-+ if (!processed) {
-+ if (defaulter != null) {
-+ defaulter.handle(ai);
-+ } else {
-+ System.err.println("ERROR: unparsed \""+ai.get()+"\"");
-+ ai.next();
-+ }
-+ }
-+ }
- }
- }
-diff -ruN openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-02-28 05:02:31.000000000 -0500
-+++ openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-01-31 09:19:00.000000000 -0500
-@@ -19,7 +19,7 @@
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
-- *
-+ *
- */
-
- import java.util.*;
-@@ -32,343 +32,343 @@
-
- static CompilerInterface ci;
- static CompilerInterface getCI() {
-- if (ci == null) {
-- String comp = (String)getField(null, "CompilerVersion");
-- try {
-- ci = (CompilerInterface)Class.forName("CompilerInterface" + comp).newInstance();
-- } catch (Exception cnfe) {
-- System.err.println("Cannot find support for compiler " + comp);
-- throw new RuntimeException(cnfe.toString());
-- }
-- }
-- return ci;
-+ if (ci == null) {
-+ String comp = (String)getField(null, "CompilerVersion");
-+ try {
-+ ci = (CompilerInterface)Class.forName("CompilerInterface" + comp).newInstance();
-+ } catch (Exception cnfe) {
-+ System.err.println("Cannot find support for compiler " + comp);
-+ throw new RuntimeException(cnfe.toString());
-+ }
-+ }
-+ return ci;
- }
-
- protected void initNames(String flavour, String build, String outDll) {
-- if (vars == null) vars = new Hashtable();
--
-- String flavourBuild = flavour + "_" + build;
-- put("Name", getCI().makeCfgName(flavourBuild));
-- put("Flavour", flavour);
-- put("Build", build);
--
-- // ones mentioned above were needed to expand format
-- String buildBase = expandFormat(getFieldString(null, "BuildBase"));
-- String jdkDir = getFieldString(null, "JdkTargetRoot");
-- String sourceBase = getFieldString(null, "SourceBase");
-- String outDir = buildBase;
--
-- put("Id", flavourBuild);
-- put("OutputDir", outDir);
-- put("SourceBase", sourceBase);
-- put("BuildBase", buildBase);
-- put("OutputDll", jdkDir + Util.sep + outDll);
-+ if (vars == null) vars = new Hashtable();
-+
-+ String flavourBuild = flavour + "_" + build;
-+ put("Name", getCI().makeCfgName(flavourBuild));
-+ put("Flavour", flavour);
-+ put("Build", build);
-+
-+ // ones mentioned above were needed to expand format
-+ String buildBase = expandFormat(getFieldString(null, "BuildBase"));
-+ String jdkDir = getFieldString(null, "JdkTargetRoot");
-+ String sourceBase = getFieldString(null, "SourceBase");
-+ String outDir = buildBase;
-+
-+ put("Id", flavourBuild);
-+ put("OutputDir", outDir);
-+ put("SourceBase", sourceBase);
-+ put("BuildBase", buildBase);
-+ put("OutputDll", jdkDir + Util.sep + outDll);
-
-- context = new String [] {flavourBuild, flavour, build, null};
-+ context = new String [] {flavourBuild, flavour, build, null};
- }
--
-+
- protected void init(Vector includes, Vector defines) {
-- initDefaultDefines(defines);
-- initDefaultCompilerFlags(includes);
-- initDefaultLinkerFlags();
-- handleDB((String)getFieldInContext("IncludeDB"));
-+ initDefaultDefines(defines);
-+ initDefaultCompilerFlags(includes);
-+ initDefaultLinkerFlags();
-+ handleDB((String)getFieldInContext("IncludeDB"));
- }
-
-
-- protected void initDefaultCompilerFlags(Vector includes) {
-- Vector compilerFlags = new Vector();
-+ protected void initDefaultCompilerFlags(Vector includes) {
-+ Vector compilerFlags = new Vector();
-+
-+ compilerFlags.addAll(getCI().getBaseCompilerFlags(getV("Define"),
-+ includes,
-+ get("OutputDir")));
-
-- compilerFlags.addAll(getCI().getBaseCompilerFlags(getV("Define"),
-- includes,
-- get("OutputDir")));
--
-- put("CompilerFlags", compilerFlags);
-+ put("CompilerFlags", compilerFlags);
- }
-
- protected void initDefaultLinkerFlags() {
-- Vector linkerFlags = new Vector();
-+ Vector linkerFlags = new Vector();
-
-- linkerFlags.addAll(getCI().getBaseLinkerFlags( get("OutputDir"), get("OutputDll")));
-+ linkerFlags.addAll(getCI().getBaseLinkerFlags( get("OutputDir"), get("OutputDll")));
-
-- put("LinkerFlags", linkerFlags);
-+ put("LinkerFlags", linkerFlags);
- }
--
-+
- DirectoryTree getSourceTree(String sourceBase, String startAt) {
-- DirectoryTree tree = new DirectoryTree();
-+ DirectoryTree tree = new DirectoryTree();
-
-- tree.addSubdirToIgnore("Codemgr_wsdata");
-- tree.addSubdirToIgnore("deleted_files");
-- tree.addSubdirToIgnore("SCCS");
-- tree.setVerbose(true);
-- if (startAt != null) {
-- tree.readDirectory(sourceBase + File.separator + startAt);
-- } else {
-- tree.readDirectory(sourceBase);
-- }
-+ tree.addSubdirToIgnore("Codemgr_wsdata");
-+ tree.addSubdirToIgnore("deleted_files");
-+ tree.addSubdirToIgnore("SCCS");
-+ tree.setVerbose(true);
-+ if (startAt != null) {
-+ tree.readDirectory(sourceBase + File.separator + startAt);
-+ } else {
-+ tree.readDirectory(sourceBase);
-+ }
-
-- return tree;
-+ return tree;
- }
-
-
- Vector getPreferredPaths(Database currentDB) {
-- Vector preferredPaths = new Vector();
-- // In the case of multiple files with the same name in
-- // different subdirectories, prefer the versions specified in
-- // the platform file as the "os_family" and "arch" macros.
-- for (Iterator iter = currentDB.getMacros(); iter.hasNext(); ) {
-- Macro macro = (Macro) iter.next();
-- if (macro.name.equals("os_family") ||
-- macro.name.equals("arch")) {
-- preferredPaths.add(macro.contents);
-- }
-- }
-- // Also prefer "opto" over "adlc" for adlcVMDeps.hpp
-- preferredPaths.add("opto");
--
-- return preferredPaths;
-- }
--
--
-- void handleDB(String dbFile) {
-- WinGammaPlatform platform = (WinGammaPlatform)getField(null, "PlatformObject");
-- Database db = new Database(platform, platform.defaultGrandIncludeThreshold());
--
-- try {
-- File incls = new File(get("OutputDir")+Util.sep+"incls");
-- FileName oldInclTempl = platform.getInclFileTemplate();
-- FileName oldGITempl = platform.getGIFileTemplate();
-- FileName oldGDTempl = platform.getGDFileTemplate();
--
-- platform.setInclFileTemplate(new FileName(platform, incls.getPath()+Util.sep,
-- "_", "", ".incl", "", ""));
-- platform.setGIFileTemplate(new FileName(platform, incls.getPath()+Util.sep,
-- "", "_precompiled", ".incl", "", ""));
--
-- incls.mkdirs();
--
-- db.get(getFieldString(null, "Platform"), dbFile);
-- db.compute();
--
-- db.put();
--
-- //platform.setInclFileTemplate(oldInclTempl);
-- //platform.setGIFileTemplate(oldInclTempl);
-- } catch (Exception e) {
-- e.printStackTrace();
-- throw new RuntimeException("cannot do db: "+e);
-- }
--
-- putSpecificField("AllFilesHash", computeAllFiles(platform, db));
-- }
--
--
-- void addAll(Iterator i, Hashtable hash,
-- WinGammaPlatform platform, DirectoryTree tree,
-- Vector preferredPaths, Vector filesNotFound, Vector filesDuplicate) {
-- for (; i.hasNext(); ) {
-- String fileName = (String) i.next();
-- if (lookupHashFieldInContext("IgnoreFile", fileName) == null) {
-- String prefixedName = platform.envVarPrefixedFileName(fileName,
-- 0, /* ignored */
-- tree,
-- preferredPaths,
-- filesNotFound,
-- filesDuplicate);
-- if (prefixedName != null) {
-- addTo(hash, Util.normalize(prefixedName), fileName);
-- }
-- }
-- }
-+ Vector preferredPaths = new Vector();
-+ // In the case of multiple files with the same name in
-+ // different subdirectories, prefer the versions specified in
-+ // the platform file as the "os_family" and "arch" macros.
-+ for (Iterator iter = currentDB.getMacros(); iter.hasNext(); ) {
-+ Macro macro = (Macro) iter.next();
-+ if (macro.name.equals("os_family") ||
-+ macro.name.equals("arch")) {
-+ preferredPaths.add(macro.contents);
-+ }
-+ }
-+ // Also prefer "opto" over "adlc" for adlcVMDeps.hpp
-+ preferredPaths.add("opto");
-+
-+ return preferredPaths;
-+ }
-+
-+
-+ void handleDB(String dbFile) {
-+ WinGammaPlatform platform = (WinGammaPlatform)getField(null, "PlatformObject");
-+ Database db = new Database(platform, platform.defaultGrandIncludeThreshold());
-+
-+ try {
-+ File incls = new File(get("OutputDir")+Util.sep+"incls");
-+ FileName oldInclTempl = platform.getInclFileTemplate();
-+ FileName oldGITempl = platform.getGIFileTemplate();
-+ FileName oldGDTempl = platform.getGDFileTemplate();
-+
-+ platform.setInclFileTemplate(new FileName(platform, incls.getPath()+Util.sep,
-+ "_", "", ".incl", "", ""));
-+ platform.setGIFileTemplate(new FileName(platform, incls.getPath()+Util.sep,
-+ "", "_precompiled", ".incl", "", ""));
-+
-+ incls.mkdirs();
-+
-+ db.get(getFieldString(null, "Platform"), dbFile);
-+ db.compute();
-+
-+ db.put();
-+
-+ //platform.setInclFileTemplate(oldInclTempl);
-+ //platform.setGIFileTemplate(oldInclTempl);
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ throw new RuntimeException("cannot do db: "+e);
-+ }
-+
-+ putSpecificField("AllFilesHash", computeAllFiles(platform, db));
-+ }
-+
-+
-+ void addAll(Iterator i, Hashtable hash,
-+ WinGammaPlatform platform, DirectoryTree tree,
-+ Vector preferredPaths, Vector filesNotFound, Vector filesDuplicate) {
-+ for (; i.hasNext(); ) {
-+ String fileName = (String) i.next();
-+ if (lookupHashFieldInContext("IgnoreFile", fileName) == null) {
-+ String prefixedName = platform.envVarPrefixedFileName(fileName,
-+ 0, /* ignored */
-+ tree,
-+ preferredPaths,
-+ filesNotFound,
-+ filesDuplicate);
-+ if (prefixedName != null) {
-+ addTo(hash, Util.normalize(prefixedName), fileName);
-+ }
-+ }
-+ }
- }
-
- void addTo(Hashtable ht, String key, String value) {
-- ht.put(expandFormat(key), expandFormat(value));
-+ ht.put(expandFormat(key), expandFormat(value));
- }
-
- Hashtable computeAllFiles(WinGammaPlatform platform, Database db) {
-- Hashtable rv = new Hashtable();
-- DirectoryTree tree = getSourceTree(get("SourceBase"), getFieldString(null, "StartAt"));
-- Vector preferredPaths = getPreferredPaths(db);
--
-- // Hold errors until end
-- Vector filesNotFound = new Vector();
-- Vector filesDuplicate = new Vector();
--
--
-- // find all files
-- Vector dbFiles = new Vector();
-- for (Iterator i=db.getAllFiles().iterator(); i.hasNext(); ) {
-- FileList fl = (FileList) i.next();
-- dbFiles.add(fl.getName());
-- }
-- addAll(dbFiles.iterator(), rv,
-- platform, tree,
-- preferredPaths, filesNotFound, filesDuplicate);
--
-- Vector addFiles = new Vector();
-- collectRelevantVectors(addFiles, "AdditionalFile");
-- addAll(addFiles.iterator(), rv,
-- platform, tree,
-- preferredPaths, filesNotFound, filesDuplicate);
--
-- collectRelevantHashes(rv, "AdditionalGeneratedFile");
--
-- if ((filesNotFound.size() != 0) ||
-- (filesDuplicate.size() != 0)) {
-- System.err.println("Error: some files were not found or " +
-- "appeared in multiple subdirectories of " +
-- "directory " + get("SourceBase") + " and could not " +
-- "be resolved with the os_family and arch " +
-- "macros in the platform file.");
-- if (filesNotFound.size() != 0) {
-- System.err.println("Files not found:");
-- for (Iterator iter = filesNotFound.iterator();
-- iter.hasNext(); ) {
-- System.err.println(" " + (String) iter.next());
-- }
-- }
-- if (filesDuplicate.size() != 0) {
-- System.err.println("Duplicate files:");
-- for (Iterator iter = filesDuplicate.iterator();
-- iter.hasNext(); ) {
-- System.err.println(" " + (String) iter.next());
-- }
More information about the distro-pkg-dev
mailing list