changeset in /hg/icedtea: 2008-12-03 Matthias Klose <doko at ubun...
doko at ubuntu.com
doko at ubuntu.com
Thu Dec 4 06:11:30 PST 2008
changeset 1e8622897317 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1e8622897317
description:
2008-12-03 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ZERO_PATCHES, ICEDTEA_PATCHES): Fix patch order.
* patches/icedtea-hotspot7-build-fixes.patch: Restore.
diffstat:
3 files changed, 81 insertions(+), 4 deletions(-)
ChangeLog | 5 ++
Makefile.am | 16 +++++--
patches/icedtea-hotspot7-build-fixes.patch | 64 ++++++++++++++++++++++++++++
diffs (128 lines):
diff -r 0e428e4ada66 -r 1e8622897317 ChangeLog
--- a/ChangeLog Wed Dec 03 16:33:42 2008 +0100
+++ b/ChangeLog Wed Dec 03 17:15:58 2008 +0100
@@ -1,3 +1,8 @@ 2008-12-03 Matthias Klose <doko at ubuntu
+2008-12-03 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (ZERO_PATCHES, ICEDTEA_PATCHES): Fix patch order.
+ * patches/icedtea-hotspot7-build-fixes.patch: Restore.
+
2008-12-03 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-shark.patch: Moved to ...
diff -r 0e428e4ada66 -r 1e8622897317 Makefile.am
--- a/Makefile.am Wed Dec 03 16:33:42 2008 +0100
+++ b/Makefile.am Wed Dec 03 17:15:58 2008 +0100
@@ -457,7 +457,14 @@ 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 = \
+ patches/icedtea-hotspot-6b12-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 \
@@ -466,7 +473,6 @@ ZERO_PATCHES = \
if !WITH_ALT_HSBUILD
ZERO_PATCHES += \
- patches/icedtea-hotspot-6b12-7b24.patch \
patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-hotspot-citypeflow.patch
@@ -539,9 +545,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-fonts.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch \
patches/icedtea-shark-build.patch \
@@ -600,6 +603,11 @@ ICEDTEA_PATCHES += \
patches/icedtea-sparc.patch
endif
+ICEDTEA_PATCHES += \
+ patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch
+
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/icedtea-rhino.patch
diff -r 0e428e4ada66 -r 1e8622897317 patches/icedtea-hotspot7-build-fixes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-hotspot7-build-fixes.patch Wed Dec 03 17:15:58 2008 +0100
@@ -0,0 +1,64 @@
+diff -r 2323cafebabe openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-01-31 09:19:01.000000000 -0500
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-29 13:12:39.000000000 -0500
+@@ -86,16 +86,12 @@
+ #define VMLP ""
+ #endif
+
+-#ifdef KERNEL
+- #define VMTYPE "Kernel"
+-#else // KERNEL
+ #ifdef TIERED
+ #define VMTYPE "Server"
+ #else
+ #define VMTYPE COMPILER1_PRESENT("Client") \
+ COMPILER2_PRESENT("Server")
+ #endif // TIERED
+-#endif // KERNEL
+
+ #ifndef HOTSPOT_VM_DISTRO
+ #error HOTSPOT_VM_DISTRO must be defined
+diff -r 848a72e3bc9b openjdk/hotspot/build/linux/makefiles/top.make
+--- openjdk/hotspot/build/linux/makefiles/top.make Fri Feb 29 17:02:22 2008 +0000
++++ openjdk/hotspot/build/linux/makefiles/top.make Fri Feb 29 17:04:07 2008 +0000
+@@ -67,7 +67,9 @@ Include_DBs/GC = $(VM)/includeD
+ $(VM)/gc_implementation/includeDB_gc_serial \
+ $(VM)/gc_implementation/includeDB_gc_shared
+
+-Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC)
++Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \
++ $(VM)/includeDB_jvmti \
++ $(VM)/includeDB_features
+ Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
+ Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
+ Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
+diff -r 2323cafebabe openjdk/hotspot/build/linux/makefiles/jvmti.make
+--- openjdk/hotspot/build/linux/makefiles/jvmti.make 2008-02-29 16:50:25.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/jvmti.make 2008-02-29 10:21:43.000000000 +0000
+@@ -36,6 +36,7 @@
+ JvmtiOutDir = $(GENERATED)/jvmtifiles
+
+ JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims
++InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter
+ Src_Dirs += $(JvmtiSrcDir)
+
+ # set VPATH so make knows where to look for source files
+@@ -47,6 +48,7 @@
+ jvmtiEnter.cpp \
+ jvmtiEnterTrace.cpp \
+ jvmtiEnvRecommended.cpp\
++ bytecodeInterpreterWithChecks.cpp \
+ jvmti.h \
+
+ JvmtiEnvFillSource = $(JvmtiSrcDir)/jvmtiEnvFill.java
+@@ -77,6 +79,10 @@
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
+
++$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
++ @echo Generating $@
++ $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
++
+ $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
More information about the distro-pkg-dev
mailing list