changeset in /hg/icedtea6: 2009-05-08 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Fri May 8 03:23:47 PDT 2009
changeset 934d7b595b32 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=934d7b595b32
description:
2009-05-08 Gary Benson <gbenson at redhat.com>
* Makefile.am: Removed patches and logic for building Zero and
Shark with original HotSpot.
* patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed.
* patches/icedtea-hotspot-6b14-7b24.patch: Likewise.
* patches/icedtea-hotspot-citypeflow.patch: Likewise.
* patches/icedtea-hotspot7-build-fixes.patch: Likewise.
* patches/icedtea-signed-types.patch: Likewise.
* patches/hotspot/original/icedtea-core-zero-build.patch: Likewise.
* HACKING: Updated.
diffstat:
9 files changed, 35 insertions(+), 14204 deletions(-)
ChangeLog | 14
HACKING | 15
Makefile.am | 56
patches/hotspot/original/icedtea-core-zero-build.patch | 104
patches/icedtea-bytecodeInterpreterWithChecks.patch | 18
patches/icedtea-hotspot-6b14-7b24.patch |13966 ----------------
patches/icedtea-hotspot-citypeflow.patch | 11
patches/icedtea-hotspot7-build-fixes.patch | 19
patches/icedtea-signed-types.patch | 36
diffs (truncated from 14332 to 500 lines):
diff -r c5c31d555ae3 -r 934d7b595b32 ChangeLog
--- a/ChangeLog Wed May 06 16:10:04 2009 -0400
+++ b/ChangeLog Fri May 08 11:24:32 2009 +0100
@@ -1,3 +1,17 @@ 2009-05-05 Deepak Bhole <dbhole at redhat.
+2009-05-08 Gary Benson <gbenson at redhat.com>
+
+ * Makefile.am: Removed patches and logic for building Zero and
+ Shark with original HotSpot.
+
+ * patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed.
+ * patches/icedtea-hotspot-6b14-7b24.patch: Likewise.
+ * patches/icedtea-hotspot-citypeflow.patch: Likewise.
+ * patches/icedtea-hotspot7-build-fixes.patch: Likewise.
+ * patches/icedtea-signed-types.patch: Likewise.
+ * patches/hotspot/original/icedtea-core-zero-build.patch: Likewise.
+
+ * HACKING: Updated.
+
2009-05-05 Deepak Bhole <dbhole at redhat.com>
* Makefile.am: Remove GCJ Web Plugin support.
diff -r c5c31d555ae3 -r 934d7b595b32 HACKING
--- a/HACKING Wed May 06 16:10:04 2009 -0400
+++ b/HACKING Fri May 08 11:24:32 2009 +0100
@@ -125,18 +125,9 @@ The following patches are only applied f
The following patches are only applied for IcedTea builds using the zero-assembler:
* 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-6b12-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 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.
-* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
@@ -175,3 +166,9 @@ changes to the OpenJDK code base and/or
* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
* openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
* icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset.
+* icedtea-hotspot-6b14-7b24.patch: Upgrade HotSpot to a version with the C++ interpreter; not required with HS14.
+* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef; not required with HS14.
+* icedtea-signed-types.patch: Make use of unsigned/signed types explicit; not required with HS14.
+* icedtea-hotspot-citypeflow.patch: Not required with HS14.
+* icedtea-core-zero-build.patch: Not required with HS14.
+* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14.
diff -r c5c31d555ae3 -r 934d7b595b32 Makefile.am
--- a/Makefile.am Wed May 06 16:10:04 2009 -0400
+++ b/Makefile.am Fri May 08 11:24:32 2009 +0100
@@ -459,16 +459,8 @@ else
patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch
endif
-# If ZERO_BUILD is set then we are building zero and need
-# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
-if WITH_ALT_HSBUILD
-ZERO_PATCHES =
-else
+# Zero patches
ZERO_PATCHES = \
- patches/icedtea-hotspot-6b14-7b24.patch \
- patches/icedtea-hotspot7-build-fixes.patch
-endif
-ZERO_PATCHES += \
patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
@@ -476,27 +468,23 @@ ZERO_PATCHES += \
patches/icedtea-ia64-bugfix.patch \
patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch
-if !WITH_ALT_HSBUILD
-ZERO_PATCHES += \
- patches/icedtea-signed-types.patch \
- patches/icedtea-hotspot-citypeflow.patch
-endif
-
-# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
+if ZERO_BUILD
+ ZERO_PATCHES_COND = $(ZERO_PATCHES)
+else
+ ZERO_PATCHES_COND =
+endif
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot
+OLD_HOTSPOT_PATCHES = \
patches/icedtea-signed-types-hot6.patch \
patches/icedtea-lucene-crash.patch \
patches/icedtea-6700047-loopopts.patch \
patches/icedtea-6712835-ifnode.patch
-if ZERO_BUILD
- ZERO_PATCHES_COND = $(ZERO_PATCHES)
-else
if WITH_ALT_HSBUILD
- ZERO_PATCHES_COND =
-else
- ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
-endif
+ OLD_HOTSPOT_PATCHES_COND =
+else
+ OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES)
endif
# If Shark is required, apply shark patch
@@ -510,6 +498,7 @@ ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
$(ZERO_PATCHES_COND) \
+ $(OLD_HOTSPOT_PATCHES_COND) \
patches/icedtea-version.patch \
patches/hotspot/$(HSBUILD)/icedtea-version.patch \
patches/icedtea-copy-plugs.patch \
@@ -539,22 +528,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-javafiles.patch \
patches/icedtea-core-build.patch \
patches/icedtea-jvmtiEnv.patch \
- patches/icedtea-lcms.patch
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
- patches/hotspot/$(HSBUILD)/icedtea-core-build.patch
-else
-if ZERO_BUILD
-ICEDTEA_PATCHES += \
- patches/hotspot/$(HSBUILD)/icedtea-core-zero-build.patch
-else
-ICEDTEA_PATCHES += \
- patches/hotspot/$(HSBUILD)/icedtea-core-build.patch
-endif
-endif
-
-ICEDTEA_PATCHES += \
+ patches/icedtea-lcms.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
@@ -615,7 +590,6 @@ endif
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
- patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-sparc.patch
endif
diff -r c5c31d555ae3 -r 934d7b595b32 patches/hotspot/original/icedtea-core-zero-build.patch
--- a/patches/hotspot/original/icedtea-core-zero-build.patch Wed May 06 16:10:04 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
---- openjdk/hotspot/make/Makefile.orig 2008-11-25 09:11:57.000000000 +0000
-+++ openjdk/hotspot/make/Makefile 2008-12-05 16:54:54.000000000 +0000
-@@ -91,6 +91,15 @@
- all_debug: jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
-
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore: all_productcore all_fastdebugcore
-+all_productcore: productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore: jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -113,6 +122,10 @@
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-
-+$(CORE_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- $(MAKE_ARGS) $(VM_TARGET)
- endif
-
-+generic_buildcore:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
-
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef ICEDTEA_CORE_BUILD
-+ MISC_DIR=$(C2_DIR)
-+ GEN_DIR=$(C2_BASE_DIR)/generated
-+else
- ifeq ($(ARCH_DATA_MODEL), 32)
- MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -219,6 +246,7 @@
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
- endif
-+endif
-
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-05 16:54:13.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 16:54:54.000000000 +0000
-@@ -89,8 +89,12 @@
- #ifdef TIERED
- #define VMTYPE "Server"
- #else
-- #define VMTYPE COMPILER1_PRESENT("Client") \
-- COMPILER2_PRESENT("Server")
-+#if defined(COMPILER1) || defined(COMPILER2)
-+ #define VMTYPE COMPILER1_PRESENT("Client") \
-+ COMPILER2_PRESENT("Server")
-+#else
-+ #define VMTYPE "Core"
-+#endif // COMPILER1 || COMPILER2
- #endif // TIERED
-
- #ifndef HOTSPOT_VM_DISTRO
---- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-11-25 09:11:51.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-12-05 16:54:54.000000000 +0000
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
- endif
- endif
-+endif
diff -r c5c31d555ae3 -r 934d7b595b32 patches/icedtea-bytecodeInterpreterWithChecks.patch
--- a/patches/icedtea-bytecodeInterpreterWithChecks.patch Wed May 06 16:10:04 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-12 03:46:08.000000000 -0400
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-29 11:57:33.000000000 -0400
-@@ -6,6 +6,7 @@
-
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-+<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- <xsl:template match="processcode">
- <xsl:text>
- #define VM_JVMTI
-@@ -15,7 +16,6 @@
-
- </xsl:text>
-
--<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- </xsl:template>
-
- </xsl:stylesheet>
diff -r c5c31d555ae3 -r 934d7b595b32 patches/icedtea-hotspot-6b14-7b24.patch
--- a/patches/icedtea-hotspot-6b14-7b24.patch Wed May 06 16:10:04 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13966 +0,0 @@
-diff -ruNb 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-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-12-05 16:41:21.727631421 +0100
-@@ -704,6 +704,3 @@
- receiver.add(attr); receiver.add(value);
- }
- }
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java openjdk/hotspot/src/share/tools/MakeDeps/Macro.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/tools/MakeDeps/Macro.java 2008-12-05 16:41:21.727631421 +0100
-@@ -26,4 +26,3 @@
- public String name;
- public String contents;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlc.hpp openjdk/hotspot/src/share/vm/adlc/adlc.hpp
---- openjdk6/hotspot/src/share/vm/adlc/adlc.hpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2008-12-05 16:41:21.737631572 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adlc.hpp 1.28 07/05/05 17:04:59 JVM"
--#endif
- /*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
---- openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp 2008-12-05 16:41:21.737631572 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)adlparse.cpp 1.205 07/05/05 17:05:00 JVM"
--#endif
- /*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp openjdk/hotspot/src/share/vm/adlc/adlparse.hpp
---- openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/adlparse.hpp 2008-12-05 16:41:21.737631572 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adlparse.hpp 1.79 07/05/05 17:05:00 JVM"
--#endif
- /*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -273,5 +270,3 @@
- static bool is_int_token(const char* token, int& intval);
- static void trim(char* &token); // trim leading & trailing spaces
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
---- openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/archDesc.cpp 2008-12-05 16:41:21.737631572 +0100
-@@ -22,6 +22,7 @@
- //
- //
-
-+
- // archDesc.cpp - Internal format for architecture definition
- #include "adlc.hpp"
-
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.cpp openjdk/hotspot/src/share/vm/adlc/arena.cpp
---- openjdk6/hotspot/src/share/vm/adlc/arena.cpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/arena.cpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)arena.cpp 1.16 07/05/05 17:05:00 JVM"
--#endif
- /*
- * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -173,4 +170,3 @@
- void CHeapObj::operator delete(void* p){
- free(p);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.hpp openjdk/hotspot/src/share/vm/adlc/arena.hpp
---- openjdk6/hotspot/src/share/vm/adlc/arena.hpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/arena.hpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)arena.hpp 1.17 07/05/05 17:05:00 JVM"
--#endif
- /*
- * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -158,4 +155,3 @@
- size_t size_in_bytes() const { return _size_in_bytes; }
- void set_size_in_bytes(size_t size) { _size_in_bytes = size; }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dfa.cpp openjdk/hotspot/src/share/vm/adlc/dfa.cpp
---- openjdk6/hotspot/src/share/vm/adlc/dfa.cpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/dfa.cpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dfa.cpp 1.83 07/05/05 17:04:59 JVM"
--#endif
- /*
- * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1022,4 +1019,3 @@
- void ProductionState::print() {
- _production.print(print_key, print_production);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.cpp openjdk/hotspot/src/share/vm/adlc/dict2.cpp
---- openjdk6/hotspot/src/share/vm/adlc/dict2.cpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dict2.cpp 1.19 07/05/05 17:04:59 JVM"
--#endif
- /*
- * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -354,5 +351,3 @@
- }
- _key = _value = NULL;
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.hpp openjdk/hotspot/src/share/vm/adlc/dict2.hpp
---- openjdk6/hotspot/src/share/vm/adlc/dict2.hpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/dict2.hpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)dict2.hpp 1.16 07/05/05 17:05:01 JVM"
--#endif
- /*
- * Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -121,5 +118,3 @@
- };
-
- #endif // _DICT_
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
---- openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)filebuff.cpp 1.30 07/05/05 17:05:01 JVM"
--#endif
- /*
- * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -297,4 +294,3 @@
- va_end(args);
- _AD._no_output = 1;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp
---- openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp 2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)filebuff.hpp 1.27 07/05/05 17:05:01 JVM"
--#endif
- /*
- * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.cpp openjdk/hotspot/src/share/vm/adlc/forms.cpp
---- openjdk6/hotspot/src/share/vm/adlc/forms.cpp 2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/forms.cpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)forms.cpp 1.161 07/05/05 17:04:59 JVM"
--#endif
- /*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -386,4 +383,3 @@
- void SourceForm::output(FILE *fp) {
- fprintf(fp,"\n//%s\n%s\n",classname(),(_code?_code:""));
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.hpp openjdk/hotspot/src/share/vm/adlc/forms.hpp
---- openjdk6/hotspot/src/share/vm/adlc/forms.hpp 2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/forms.hpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)forms.hpp 1.150 07/05/05 17:05:00 JVM"
--#endif
- /*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -587,6 +584,3 @@
- void print_asserts(FILE *fp);
- void dump();
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
---- openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp 2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)formsopt.cpp 1.53 07/05/05 17:05:01 JVM"
--#endif
- /*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -725,4 +722,3 @@
- void PeepReplace::output(FILE *fp) { // Write info to output files
- fprintf(fp,"PeepReplace:\n");
More information about the distro-pkg-dev
mailing list