changeset in /hg/icedtea: Make original the default for OpenJDK7.
Andrew John Hughes
gnu_andrew at member.fsf.org
Thu Dec 4 10:38:14 PST 2008
changeset d6e0712415c3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d6e0712415c3
description:
Make original the default for OpenJDK7.
2008-12-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/ecj/icedtea-hotspot-14.0b08.patch,
* patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/14.0b08/icedtea-core-build.patch,
* patches/hotspot/14.0b08/icedtea-debuginfo.patch,
* patches/hotspot/14.0b08/icedtea-gcc-4.3.patch,
* patches/hotspot/14.0b08/icedtea-gcc-suffix.patch,
* patches/hotspot/14.0b08/icedtea-headers.patch,
* patches/hotspot/14.0b08/icedtea-memory-limits.patch,
* patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch,
* patches/hotspot/14.0b08/icedtea-shark-build.patch,
* patches/hotspot/14.0b08/icedtea-shark.patch,
* patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch,
* patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch,
* patches/hotspot/14.0b08/icedtea-sparc64-linux.patch,
* patches/hotspot/14.0b08/icedtea-static-libstdc++.patch,
* patches/hotspot/14.0b08/icedtea-text-relocations.patch,
* patches/hotspot/14.0b08/icedtea-use-idx_t.patch,
* patches/hotspot/14.0b08/icedtea-version.patch,
* patches/hotspot/14.0b08/icedtea-zero-build.patch:
Moved to...
* acinclude.m4: Make original the default.
* patches/ecj/icedtea-hotspot-original.patch,
* patches/hotspot/original/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/original/icedtea-core-build.patch,
* patches/hotspot/original/icedtea-debuginfo.patch,
* patches/hotspot/original/icedtea-gcc-4.3.patch,
* patches/hotspot/original/icedtea-gcc-suffix.patch,
* patches/hotspot/original/icedtea-headers.patch,
* patches/hotspot/original/icedtea-memory-limits.patch,
* patches/hotspot/original/icedtea-params-cast-size_t.patch,
* patches/hotspot/original/icedtea-shark-build.patch,
* patches/hotspot/original/icedtea-shark.patch,
* patches/hotspot/original/icedtea-sparc-ptracefix.patch,
* patches/hotspot/original/icedtea-sparc-trapsfix.patch,
* patches/hotspot/original/icedtea-sparc64-linux.patch,
* patches/hotspot/original/icedtea-static-libstdc++.patch,
* patches/hotspot/original/icedtea-text-relocations.patch,
* patches/hotspot/original/icedtea-use-idx_t.patch,
* patches/hotspot/original/icedtea-version.patch,
* patches/hotspot/original/icedtea-zero-build.patch: here.
diffstat:
40 files changed, 1401 insertions(+), 1358 deletions(-)
ChangeLog | 43 +
acinclude.m4 | 2
patches/ecj/icedtea-hotspot-14.0b08.patch | 48 -
patches/ecj/icedtea-hotspot-original.patch | 48 +
patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/14.0b08/icedtea-core-build.patch | 108 ---
patches/hotspot/14.0b08/icedtea-debuginfo.patch | 15
patches/hotspot/14.0b08/icedtea-gcc-4.3.patch | 54 -
patches/hotspot/14.0b08/icedtea-gcc-suffix.patch | 25
patches/hotspot/14.0b08/icedtea-headers.patch | 13
patches/hotspot/14.0b08/icedtea-memory-limits.patch | 23
patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch | 121 ---
patches/hotspot/14.0b08/icedtea-shark-build.patch | 233 -------
patches/hotspot/14.0b08/icedtea-shark.patch | 366 ------------
patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch | 34 -
patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/14.0b08/icedtea-sparc64-linux.patch | 42 -
patches/hotspot/14.0b08/icedtea-static-libstdc++.patch | 16
patches/hotspot/14.0b08/icedtea-text-relocations.patch | 15
patches/hotspot/14.0b08/icedtea-use-idx_t.patch | 45 -
patches/hotspot/14.0b08/icedtea-version.patch | 38 -
patches/hotspot/14.0b08/icedtea-zero-build.patch | 129 ----
patches/hotspot/original/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/original/icedtea-core-build.patch | 108 +++
patches/hotspot/original/icedtea-debuginfo.patch | 15
patches/hotspot/original/icedtea-gcc-4.3.patch | 54 +
patches/hotspot/original/icedtea-gcc-suffix.patch | 25
patches/hotspot/original/icedtea-headers.patch | 13
patches/hotspot/original/icedtea-memory-limits.patch | 23
patches/hotspot/original/icedtea-params-cast-size_t.patch | 121 +++
patches/hotspot/original/icedtea-shark-build.patch | 233 +++++++
patches/hotspot/original/icedtea-shark.patch | 366 ++++++++++++
patches/hotspot/original/icedtea-sparc-ptracefix.patch | 34 +
patches/hotspot/original/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/original/icedtea-sparc64-linux.patch | 42 +
patches/hotspot/original/icedtea-static-libstdc++.patch | 16
patches/hotspot/original/icedtea-text-relocations.patch | 15
patches/hotspot/original/icedtea-use-idx_t.patch | 45 +
patches/hotspot/original/icedtea-version.patch | 38 +
patches/hotspot/original/icedtea-zero-build.patch | 129 ++++
diffs (truncated from 2928 to 500 lines):
diff -r 4c80afa670e8 -r d6e0712415c3 ChangeLog
--- a/ChangeLog Thu Dec 04 14:24:01 2008 +0000
+++ b/ChangeLog Thu Dec 04 18:38:00 2008 +0000
@@ -1,3 +1,46 @@ 2008-12-04 Andrew John Hughes <gnu_and
+2008-12-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/ecj/icedtea-hotspot-14.0b08.patch,
+ * patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/14.0b08/icedtea-core-build.patch,
+ * patches/hotspot/14.0b08/icedtea-debuginfo.patch,
+ * patches/hotspot/14.0b08/icedtea-gcc-4.3.patch,
+ * patches/hotspot/14.0b08/icedtea-gcc-suffix.patch,
+ * patches/hotspot/14.0b08/icedtea-headers.patch,
+ * patches/hotspot/14.0b08/icedtea-memory-limits.patch,
+ * patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/14.0b08/icedtea-shark-build.patch,
+ * patches/hotspot/14.0b08/icedtea-shark.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc64-linux.patch,
+ * patches/hotspot/14.0b08/icedtea-static-libstdc++.patch,
+ * patches/hotspot/14.0b08/icedtea-text-relocations.patch,
+ * patches/hotspot/14.0b08/icedtea-use-idx_t.patch,
+ * patches/hotspot/14.0b08/icedtea-version.patch,
+ * patches/hotspot/14.0b08/icedtea-zero-build.patch:
+ Moved to...
+ * acinclude.m4: Make original the default.
+ * patches/ecj/icedtea-hotspot-original.patch,
+ * patches/hotspot/original/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/original/icedtea-core-build.patch,
+ * patches/hotspot/original/icedtea-debuginfo.patch,
+ * patches/hotspot/original/icedtea-gcc-4.3.patch,
+ * patches/hotspot/original/icedtea-gcc-suffix.patch,
+ * patches/hotspot/original/icedtea-headers.patch,
+ * patches/hotspot/original/icedtea-memory-limits.patch,
+ * patches/hotspot/original/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/original/icedtea-shark-build.patch,
+ * patches/hotspot/original/icedtea-shark.patch,
+ * patches/hotspot/original/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/original/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/original/icedtea-sparc64-linux.patch,
+ * patches/hotspot/original/icedtea-static-libstdc++.patch,
+ * patches/hotspot/original/icedtea-text-relocations.patch,
+ * patches/hotspot/original/icedtea-use-idx_t.patch,
+ * patches/hotspot/original/icedtea-version.patch,
+ * patches/hotspot/original/icedtea-zero-build.patch: here.
+
2008-12-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
Merge from IcedTea6.
diff -r 4c80afa670e8 -r d6e0712415c3 acinclude.m4
--- a/acinclude.m4 Thu Dec 04 14:24:01 2008 +0000
+++ b/acinclude.m4 Thu Dec 04 18:38:00 2008 +0000
@@ -1015,7 +1015,7 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
- DEFAULT_BUILD="14.0b08"
+ DEFAULT_BUILD="original"
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use)],
diff -r 4c80afa670e8 -r d6e0712415c3 patches/ecj/icedtea-hotspot-14.0b08.patch
--- a/patches/ecj/icedtea-hotspot-14.0b08.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -263,28 +263,24 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
-@@ -74,8 +74,8 @@
- mkdir -p $(SA_CLASSDIR); \
- fi
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
-
-
diff -r 4c80afa670e8 -r d6e0712415c3 patches/ecj/icedtea-hotspot-original.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-hotspot-original.patch Thu Dec 04 18:38:00 2008 +0000
@@ -0,0 +1,48 @@
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
+@@ -263,28 +263,24 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
+@@ -74,8 +74,8 @@
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+
+
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch
--- a/patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2008-10-23 08:41:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2008-10-30 15:48:48.000000000 +0000
-@@ -60,7 +60,6 @@
- };
-
- class BytecodeInterpreter : StackObj {
--friend class SharedRuntime;
- friend class AbstractInterpreterGenerator;
- friend class CppInterpreterGenerator;
- friend class InterpreterGenerator;
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-core-build.patch
--- a/patches/hotspot/14.0b08/icedtea-core-build.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
-@@ -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 -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-06-22 03:10:05.000000000 +0100
-@@ -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)
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 22:28:30.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-06-22 03:10:05.000000000 +0100
-@@ -94,8 +94,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
- #endif // KERNEL
-
-
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-debuginfo.patch
--- a/patches/hotspot/14.0b08/icedtea-debuginfo.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-08-20 22:58:22.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-08-20 23:01:45.000000000 +0100
-@@ -62,6 +62,10 @@
- CFLAGS += -D_REENTRANT
- CFLAGS += -fcheck-new
-
-+# Always generate full debuginfo on Linux. It'll be in a separate
-+# debuginfo package when building RPMs.
-+CFLAGS += -g
-+
- ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
- ARCHFLAG/i486 = -m32 -march=i586
- ARCHFLAG/amd64 = -m64
-
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-gcc-4.3.patch
--- a/patches/hotspot/14.0b08/icedtea-gcc-4.3.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-12-01 12:06:51.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-12-01 12:27:08.000000000 +0000
-@@ -98,7 +98,7 @@
- endif
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# WARNINGS_ARE_ERRORS = -Werror
-
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
---- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2008-12-01 12:25:10.000000000 +0000
-@@ -109,7 +109,8 @@
-
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
-+# WARNINGS_ARE_ERRORS = -Werror
- # Enable these warnings. See 'info gcc' about details on these options
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
-diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
---- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-12-01 12:25:10.000000000 +0000
-@@ -25,6 +25,8 @@
- // FILEBUFF.CPP - Routines for handling a parser file buffer
- #include "adlc.hpp"
-
-+using namespace std;
-+
- //------------------------------FileBuff---------------------------------------
- // Create a new parsing buffer
- FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
-diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp
---- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-12-01 12:25:10.000000000 +0000
-@@ -94,8 +94,11 @@
- FileBuffRegion *copy(); // Deep copy
- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
-
--// void print(std::ostream&);
--// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+ void print(std::ostream&);
-+ friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#else
- void print(ostream&);
- friend ostream& operator<< (ostream&, FileBuffRegion&);
-+#endif
- };
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-gcc-suffix.patch
--- a/patches/hotspot/14.0b08/icedtea-gcc-suffix.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
---- openjdk/hotspot/agent/src/os/linux/Makefile~ 2007-08-02 09:16:50.000000000 +0200
-+++ openjdk/hotspot/agent/src/os/linux/Makefile 2007-08-08 17:00:11.204338801 +0200
-@@ -23,7 +23,7 @@
- #
-
- ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
--GCC = gcc
-+GCC = gcc$(GCC_SUFFIX)
-
- JAVAH = ${JAVA_HOME}/bin/javah
-
---- openjdk/hotspot/make/linux/makefiles/gcc.make~ 2007-08-08 16:13:12.281815996 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2007-08-08 16:36:52.573240769 +0200
-@@ -25,8 +25,8 @@
- #------------------------------------------------------------------------
- # CC, CPP & AS
-
--CPP = g++
--CC = gcc
-+CPP = g++$(GCC_SUFFIX)
-+CC = gcc$(GCC_SUFFIX)
- AS = $(CC) -c
-
- # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
-
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-headers.patch
--- a/patches/hotspot/14.0b08/icedtea-headers.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make
---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100
-@@ -59,7 +59,7 @@
-
- JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
-
--XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
-+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen
-
- .PHONY: all jvmtidocs clean cleanall
-
-
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-memory-limits.patch
--- a/patches/hotspot/14.0b08/icedtea-memory-limits.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
---- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:44.000000000 +0100
-+++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:59.000000000 +0100
-@@ -98,7 +98,7 @@
-
- // Heap related flags
- define_pd_global(uintx, PermSize, ScaleForWordSize(16*M));
--define_pd_global(uintx, MaxPermSize, ScaleForWordSize(64*M));
-+define_pd_global(uintx, MaxPermSize, ScaleForWordSize(128*M));
-
- // Ergonomics related flags
- define_pd_global(bool, NeverActAsServerClassMachine, false);
---- penjdk6/hotspot/src/share/vm/runtime/globals.hpp 2008-02-12 04:14:24.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2008-02-14 16:34:00.000000000 -0500
-@@ -2606,7 +2606,7 @@
- "an OS lock") \
- \
- /* gc parameters */ \
-- product(uintx, MaxHeapSize, ScaleForWordSize(64*M), \
-+ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \
- "Default maximum size for object heap (in bytes)") \
- \
- product_pd(uintx, NewSize, \
diff -r 4c80afa670e8 -r d6e0712415c3 patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch
--- a/patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch Thu Dec 04 14:24:01 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2008-09-01 01:47:18.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2008-09-01 01:53:31.000000000 +0100
-@@ -938,7 +938,7 @@
- if (free_percentage < desired_free_percentage) {
- size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
- assert(desired_capacity >= capacity(), "invalid expansion size");
-- expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes);
-+ expand_bytes = MAX2((long unsigned int) (desired_capacity - capacity()), (long unsigned int) MinHeapDeltaBytes);
- }
- if (expand_bytes > 0) {
- if (PrintGCDetails && Verbose) {
-@@ -6044,7 +6044,7 @@
- HeapWord* curAddr = _markBitMap.startWord();
- while (curAddr < _markBitMap.endWord()) {
- size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
-- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
-+ MemRegion chunk(curAddr, MIN2((size_t) CMSBitMapYieldQuantum, remaining));
- _markBitMap.clear_large_range(chunk);
- if (ConcurrentMarkSweepThread::should_yield() &&
- !foregroundGCIsActive() &&
-@@ -6332,7 +6332,7 @@
- return;
- }
- // Double capacity if possible
-- size_t new_capacity = MIN2(_capacity*2, CMSMarkStackSizeMax);
-+ size_t new_capacity = MIN2((size_t) (_capacity*2), (size_t) CMSMarkStackSizeMax);
- // Do not give up existing stack until we have managed to
- // get the double capacity that we desired.
- ReservedSpace rs(ReservedSpace::allocation_align_size_up(
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2008-08-14 08:40:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2008-09-01 01:49:59.000000000 +0100
-@@ -904,8 +904,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
- const size_t max = 100;
-- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+ _dwl_mean = double(MIN2((size_t) ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+ _dwl_std_dev = double(MIN2((size_t) ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
- _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
- DEBUG_ONLY(_dwl_initialized = true;)
- _dwl_adjustment = normal_distribution(1.0);
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2008-08-14 08:40:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2008-09-01 01:52:42.000000000 +0100
-@@ -63,7 +63,7 @@
- _last_used = current_live;
-
- // We have different alignment constraints than the rest of the heap.
-- const size_t alignment = MAX2(MinPermHeapExpansion,
-+ const size_t alignment = MAX2((size_t) MinPermHeapExpansion,
More information about the distro-pkg-dev
mailing list