changeset in /hg/icedtea6: 2008-12-05 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Fri Dec 5 09:31:00 PST 2008
changeset 0623a28ecba1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0623a28ecba1
description:
2008-12-05 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-hotspot7-build-fixes.patch: Update.
* patches/hotspot/original/icedtea-core-zero-build.patch: Regenerate
from original/icedtea-core-build.patch.
* patches/icedtea-hotspot-6b14-7b24.patch: Newly generated.
* patches/icedtea-hotspot-6b12-7b24.patch: Remove.
* Makefile.am (ICEDTEA_PATCHES): Update for zero, based on original
hotspot.
diffstat:
14 files changed, 14108 insertions(+), 57039 deletions(-)
ChangeLog | 10
Makefile.am | 21
generated/com/sun/corba/se/impl/logging/ActivationSystemException.java | 2
generated/com/sun/corba/se/impl/logging/IORSystemException.java | 2
generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java | 2
generated/com/sun/corba/se/impl/logging/NamingSystemException.java | 2
generated/com/sun/corba/se/impl/logging/OMGSystemException.java | 2
generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java | 2
generated/com/sun/corba/se/impl/logging/POASystemException.java | 2
generated/com/sun/corba/se/impl/logging/UtilSystemException.java | 2
patches/hotspot/original/icedtea-core-zero-build.patch | 104
patches/icedtea-hotspot-6b12-7b24.patch |56979 ----------
patches/icedtea-hotspot-6b14-7b24.patch |13966 ++
patches/icedtea-hotspot7-build-fixes.patch | 51
diffs (truncated from 71286 to 500 lines):
diff -r 7801bbe25e3a -r 0623a28ecba1 ChangeLog
--- a/ChangeLog Fri Dec 05 11:39:17 2008 -0500
+++ b/ChangeLog Fri Dec 05 18:30:11 2008 +0100
@@ -1,3 +1,13 @@ 2008-12-05 Lillian Angel <langel at redha
+2008-12-05 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-hotspot7-build-fixes.patch: Update.
+ * patches/hotspot/original/icedtea-core-zero-build.patch: Regenerate
+ from original/icedtea-core-build.patch.
+ * patches/icedtea-hotspot-6b14-7b24.patch: Newly generated.
+ * patches/icedtea-hotspot-6b12-7b24.patch: Remove.
+ * Makefile.am (ICEDTEA_PATCHES): Update for zero, based on original
+ hotspot.
+
2008-12-05 Lillian Angel <langel at redhat.com>
* Makefile.am:
diff -r 7801bbe25e3a -r 0623a28ecba1 Makefile.am
--- a/Makefile.am Fri Dec 05 11:39:17 2008 -0500
+++ b/Makefile.am Fri Dec 05 18:30:11 2008 +0100
@@ -463,7 +463,7 @@ ZERO_PATCHES =
ZERO_PATCHES =
else
ZERO_PATCHES = \
- patches/icedtea-hotspot-6b12-7b24.patch \
+ patches/icedtea-hotspot-6b14-7b24.patch \
patches/icedtea-hotspot7-build-fixes.patch
endif
ZERO_PATCHES += \
@@ -475,7 +475,6 @@ ZERO_PATCHES += \
if !WITH_ALT_HSBUILD
ZERO_PATCHES += \
- patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-hotspot-citypeflow.patch
endif
@@ -534,8 +533,22 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-core-build.patch \
- patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \
+ patches/icedtea-core-build.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-linker-options.patch \
patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/ActivationSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/ActivationSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/ActivationSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group ACTIVATION
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc on Fri Sep 12 21:18:58 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc on Fri Dec 05 17:29:35 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/IORSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/IORSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/IORSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group IOR
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc on Fri Sep 12 21:18:58 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc on Fri Dec 05 17:29:35 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group INTERCEPTORS
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc on Fri Sep 12 21:18:58 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc on Fri Dec 05 17:29:35 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/NamingSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/NamingSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/NamingSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group NAMING
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc on Fri Sep 12 21:18:58 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc on Fri Dec 05 17:29:35 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/OMGSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/OMGSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/OMGSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for standard exceptions
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc on Fri Sep 12 21:18:59 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc on Fri Dec 05 17:29:35 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group ORBUTIL
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc on Fri Sep 12 21:18:59 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc on Fri Dec 05 17:29:35 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/POASystemException.java
--- a/generated/com/sun/corba/se/impl/logging/POASystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/POASystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group POA
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc on Fri Sep 12 21:18:59 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc on Fri Dec 05 17:29:36 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 generated/com/sun/corba/se/impl/logging/UtilSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/UtilSystemException.java Fri Dec 05 11:39:17 2008 -0500
+++ b/generated/com/sun/corba/se/impl/logging/UtilSystemException.java Fri Dec 05 18:30:11 2008 +0100
@@ -1,7 +1,7 @@
// Log wrapper class for Sun private system exceptions in group UTIL
//
// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
-// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc on Fri Sep 12 21:18:59 GMT 2008
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc on Fri Dec 05 17:29:36 GMT 2008
package com.sun.corba.se.impl.logging ;
diff -r 7801bbe25e3a -r 0623a28ecba1 patches/hotspot/original/icedtea-core-zero-build.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/icedtea-core-zero-build.patch Fri Dec 05 18:30:11 2008 +0100
@@ -0,0 +1,104 @@
+--- 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 7801bbe25e3a -r 0623a28ecba1 patches/icedtea-hotspot-6b12-7b24.patch
--- a/patches/icedtea-hotspot-6b12-7b24.patch Fri Dec 05 11:39:17 2008 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56979 +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-08-28 10:23:06.000000000 +0200
-+++ openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2007-12-14 08:57:02.000000000 +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-08-28 10:23:06.000000000 +0200
-+++ openjdk/hotspot/src/share/tools/MakeDeps/Macro.java 2007-12-14 08:57:02.000000000 +0100
-@@ -26,4 +26,3 @@
- public String name;
- public String contents;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/Platform.java openjdk/hotspot/src/share/tools/MakeDeps/Platform.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/Platform.java 2008-08-28 10:23:06.000000000 +0200
-+++ openjdk/hotspot/src/share/tools/MakeDeps/Platform.java 2007-12-14 08:57:02.000000000 +0100
-@@ -169,7 +169,7 @@
-
- /** max is 31 on mac, so warn */
- public int fileNameLengthLimit() {
-- return 40;
-+ return 45;
- }
-
- public int defaultGrandIncludeThreshold() {
-diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC6.java openjdk/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC6.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC6.java 2008-08-28 10:23:06.000000000 +0200
-+++ openjdk/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC6.java 2007-12-14 08:57:02.000000000 +0100
-@@ -236,7 +236,7 @@
- " /nologo /base:\"0x8000000\" /subsystem:windows /dll" +
- " /export:JNI_GetDefaultJavaVMInitArgs /export:JNI_CreateJavaVM /export:JNI_GetCreatedJavaVMs "+
- " /export:jio_snprintf /export:jio_printf /export:jio_fprintf /export:jio_vfprintf "+
-- " /export:jio_vsnprintf /export:JVM_EnqueueOperation ");
-+ " /export:jio_vsnprintf ");
- rv.add("SUBTRACT LINK32 /pdb:none /map");
-
- return rv;
-diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC7.java openjdk/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC7.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC7.java 2008-08-28 10:23:06.000000000 +0200
-+++ openjdk/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC7.java 2007-12-14 08:57:02.000000000 +0100
-@@ -262,6 +262,8 @@
-
- rv.add(new SpecificNameFilter("JVMTI Generated", new String[] {"^jvmti.+"}));
-
-+ rv.add(new SpecificNameFilter("C++ Interpreter Generated", new String[] {"^bytecodeInterpreterWithChecks.+"}));
-+
- rv.add(new SpecificNameFilter("Include DBs", new String[] {"^includeDB_.+"}));
-
- // this one is to catch files not caught by other filters
-@@ -574,8 +576,7 @@
- "/export:JNI_GetCreatedJavaVMs "+
- "/export:jio_snprintf /export:jio_printf "+
- "/export:jio_fprintf /export:jio_vfprintf "+
-- "/export:jio_vsnprintf "+
-- "/export:JVM_EnqueueOperation ");
-+ "/export:jio_vsnprintf ");
- addAttr(rv, "AdditionalDependencies", "Wsock32.lib winmm.lib");
- addAttr(rv, "OutputFile", outDll);
- addAttr(rv, "LinkIncremental", "1");
-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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/adlparse.hpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/archDesc.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/arena.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/arena.hpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/dfa.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/dict2.hpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/adlc/forms.cpp 2007-12-14 08:57:02.000000000 +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-08-28 10:23:07.000000000 +0200
More information about the distro-pkg-dev
mailing list