/hg/icedtea6: Drop shark patches already in hotspot 19 (and later)
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Thu May 5 15:40:17 PDT 2011
changeset 90783fa340bb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=90783fa340bb
author: Omair Majid <omajid at redhat.com>
date: Thu May 05 18:40:02 2011 -0400
Drop shark patches already in hotspot 19 (and later)
These patches were not being applied.
2011-05-05 Omair Majid <omajid at redhat.com>
* patches/shark-build-hotspot.patch,
* patches/shark-debug-option.patch,
* patches/shark_do_nothing_on_stub_frame.patch: Drop
upstreamed/unapplied patches. These were not being applied.
diffstat:
ChangeLog | 7 +
patches/shark-build-hotspot.patch | 260 ---------------------------
patches/shark-debug-option.patch | 28 --
patches/shark_do_nothing_on_stub_frame.patch | 13 -
4 files changed, 7 insertions(+), 301 deletions(-)
diffs (336 lines):
diff -r 012505ce3d0d -r 90783fa340bb ChangeLog
--- a/ChangeLog Thu May 05 17:57:53 2011 -0400
+++ b/ChangeLog Thu May 05 18:40:02 2011 -0400
@@ -1,3 +1,10 @@
+2011-05-05 Omair Majid <omajid at redhat.com>
+
+ * patches/shark-build-hotspot.patch,
+ * patches/shark-debug-option.patch,
+ * patches/shark_do_nothing_on_stub_frame.patch: Drop upstreamed/unapplied
+ patches. These were not being applied.
+
2011-05-05 Omair Majid <omajid at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack-markings.patch
diff -r 012505ce3d0d -r 90783fa340bb patches/shark-build-hotspot.patch
--- a/patches/shark-build-hotspot.patch Thu May 05 17:57:53 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,266 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
---- openjdk.orig/hotspot/make/linux/Makefile 2008-07-03 08:39:52.000000000 +0100
-+++ openjdk/hotspot/make/linux/Makefile 2008-07-13 00:59:03.000000000 +0100
-@@ -168,6 +168,13 @@
- # profiledzero zero <os>_<arch>_zero/profiled
- # productzero zero <os>_<arch>_zero/product
- #
-+# debugshark shark <os>_<arch>_shark/debug
-+# fastdebugshark shark <os>_<arch>_shark/fastdebug
-+# jvmgshark shark <os>_<arch>_shark/jvmg
-+# optimizedshark shark <os>_<arch>_shark/optimized
-+# profiledshark shark <os>_<arch>_shark/profiled
-+# productshark shark <os>_<arch>_shark/product
-+#
- # What you get with each target:
- #
- # debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
-@@ -191,12 +198,14 @@
- SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
- SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
- SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
-+SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
-
- TARGETS_C2 = $(TARGETS)
- TARGETS_C1 = $(addsuffix 1,$(TARGETS))
- TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
- TARGETS_CORE = $(addsuffix core,$(TARGETS))
- TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
-+TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
-
- BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
- BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
-@@ -213,6 +222,7 @@
- @echo " $(TARGETS_C1)"
- @echo " $(TARGETS_CORE)"
- @echo " $(TARGETS_ZERO)"
-+ @echo " $(TARGETS_SHARK)"
-
- checks: check_os_version check_j2se_version
-
-@@ -266,6 +276,10 @@
- $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
- $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
-
-+$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
-+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-+ $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
-+
- platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
- $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
-
-@@ -306,11 +320,19 @@
- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
-+$(TARGETS_SHARK): $(SUBDIRS_SHARK)
-+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
-+ifdef INSTALL
-+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
-+endif
-+
- # Just build the tree, and nothing else:
- tree: $(SUBDIRS_C2)
- tree1: $(SUBDIRS_C1)
- treecore: $(SUBDIRS_CORE)
- treezero: $(SUBDIRS_ZERO)
-+treeshark: $(SUBDIRS_SHARK)
-
- # Doc target. This is the same for all build options.
- # Hence create a docs directory beside ...$(ARCH)_[...]
-@@ -327,20 +349,22 @@
-
- zero: jvmgzero productzero
-
-+shark: jvmgshark productshark
-+
- clean_docs:
- rm -rf $(SUBDIR_DOCS)
-
--clean_compiler1 clean_compiler2 clean_core clean_zero:
-+clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark:
- rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
-
--clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
-+clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs
-
- include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
-
- #-------------------------------------------------------------------------------
-
--.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
--.PHONY: tree tree1 treecore treezero
--.PHONY: all compiler1 compiler2 core zero
--.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
-+.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
-+.PHONY: tree tree1 treecore treezero treeshark
-+.PHONY: all compiler1 compiler2 core zero shark
-+.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
- .PHONY: checks check_os_version check_j2se_version
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2008-07-13 00:38:03.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2008-07-13 00:59:03.000000000 +0100
-@@ -215,8 +215,8 @@
-
- ../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
- @echo Creating directory list $@
-- $(QUIETLY) find $(GAMMADIR)/src/share/vm/* -prune \
-- -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
-+ $(QUIETLY) find -L $(GAMMADIR)/src/share/vm/* -prune \
-+ -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find -L {} \
- \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@
-
- Makefile: $(BUILDTREE_MAKE)
-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-07-13 00:38:03.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-07-13 00:59:03.000000000 +0100
-@@ -64,6 +64,9 @@
- ifdef ICEDTEA_ZERO_BUILD
- CFLAGS += $(LIBFFI_CFLAGS)
- endif
-+ifeq ($(SHARK_BUILD), true)
-+CFLAGS += $(LLVM_CFLAGS)
-+endif
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
- CFLAGS += -fno-exceptions
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/top.make openjdk/hotspot/make/linux/makefiles/top.make
---- openjdk.orig/hotspot/make/linux/makefiles/top.make 2008-07-03 08:39:53.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/top.make 2008-07-13 00:59:03.000000000 +0100
-@@ -75,6 +75,7 @@
- Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
- Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
- Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero
-+Include_DBs/SHARK = $(Include_DBs/ZERO) $(VM)/includeDB_shark
- Include_DBs = $(Include_DBs/$(TYPE))
-
- Cached_plat = $(GENERATED)/platform.current
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2008-07-13 00:38:03.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make 2008-07-13 00:59:03.000000000 +0100
-@@ -126,10 +126,14 @@
-
- STATIC_CXX = true
-
--ifeq ($(ZERO_LIBARCH), ppc64)
-+ifeq ($(SHARK_BUILD), true)
- STATIC_CXX = false
- else
-- STATIC_CXX = true
-+ ifeq ($(ZERO_LIBARCH), ppc64)
-+ STATIC_CXX = false
-+ else
-+ STATIC_CXX = true
-+ endif
- endif
-
- ifeq ($(LINK_INTO),AOUT)
-@@ -157,6 +161,10 @@
- ifdef ICEDTEA_ZERO_BUILD
- LIBS_VM += $(LIBFFI_LIBS)
- endif
-+ifeq ($(SHARK_BUILD), true)
-+LFLAGS_VM += $(LLVM_LDFLAGS)
-+LIBS_VM += $(LLVM_LIBS)
-+endif
-
- LINK_VM = $(LINK_LIB.c)
-
-diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-07-13 00:38:02.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-07-13 00:59:03.000000000 +0100
-@@ -85,6 +85,7 @@
- C2_VM_TARGETS=product fastdebug optimized jvmg
- KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
- ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
-+SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
-
- # JDK directory list
- JDK_DIRS=bin include jre lib demo
-@@ -101,6 +102,12 @@
- all_debugzero: jvmgzero docs export_debug
- all_optimizedzero: optimizedzero docs export_optimized
-
-+allshark: all_productshark all_fastdebugshark
-+all_productshark: productshark docs export_product
-+all_fastdebugshark: fastdebugshark docs export_fastdebug
-+all_debugshark: jvmgshark docs export_debug
-+all_optimizedshark: optimizedshark docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -131,6 +138,10 @@
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
-
-+$(SHARK_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
-+
- # Build compiler1 (client) rule, different for platforms
- generic_build1:
- $(MKDIR) -p $(OUTPUTDIR)
-@@ -197,6 +208,12 @@
- $(MAKE) -f $(ABS_OS_MAKEFILE) \
- $(MAKE_ARGS) $(VM_TARGET)
-
-+generic_buildshark:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-+
- # Export file rule
- generic_export: $(EXPORT_LIST)
- export_product:
-@@ -228,15 +245,22 @@
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
-+SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
- ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
-+SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
-
- # Misc files and generated files need to come from C1 or C2 area
- ifeq ($(ZERO_BUILD), true)
-+ifeq ($(SHARK_BUILD), true)
-+ MISC_DIR=$(SHARK_DIR)
-+ GEN_DIR=$(SHARK_BASE_DIR)/generated
-+else
- MISC_DIR=$(ZERO_DIR)
- GEN_DIR=$(ZERO_BASE_DIR)/generated
-+endif
- else
- ifeq ($(ARCH_DATA_MODEL), 32)
- MISC_DIR=$(C1_DIR)
-@@ -290,10 +314,17 @@
- # Shared Library
- ifneq ($(OSNAME),windows)
- ifeq ($(ZERO_BUILD), true)
-+ ifeq ($(SHARK_BUILD), true)
-+$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
-+ $(install-file)
-+$(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so
-+ $(install-file)
-+ else
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
- $(install-file)
- $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so
- $(install-file)
-+ endif
- else
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
- $(install-file)
-@@ -345,6 +376,7 @@
- $(RM) -r $(C2_DIR)
- $(RM) -r $(KERNEL_DIR)
- $(RM) -r $(ZERO_DIR)
-+ $(RM) -r $(SHARK_DIR)
- clean_export:
- $(RM) -r $(EXPORT_PATH)
- clean_jdk:
diff -r 012505ce3d0d -r 90783fa340bb patches/shark-debug-option.patch
--- a/patches/shark-debug-option.patch Thu May 05 17:57:53 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/disassembler_zero.hpp openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/disassembler_zero.hpp 2010-05-28 11:10:31.000000000 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp 2010-06-17 19:29:24.000000000 +0100
-@@ -23,13 +23,10 @@
- *
- */
-
--// The disassembler prints out zero code annotated
--// with Java specific information.
--
- static int pd_instruction_alignment() {
-- ShouldNotCallThis();
-+ return 1;
- }
-
- static const char* pd_cpu_opts() {
-- ShouldNotCallThis();
-+ return "";
- }
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-05-28 11:10:31.000000000 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-06-17 19:29:07.000000000 +0100
-@@ -35,6 +35,7 @@
- define_pd_global(bool, UncommonNullCast, true);
-
- define_pd_global(intx, CodeEntryAlignment, 32);
-+define_pd_global(intx, OptoLoopAlignment, 16);
- define_pd_global(intx, InlineFrequencyCount, 100);
- define_pd_global(intx, PreInflateSpin, 10);
-
diff -r 012505ce3d0d -r 90783fa340bb patches/shark_do_nothing_on_stub_frame.patch
--- a/patches/shark_do_nothing_on_stub_frame.patch Thu May 05 17:57:53 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp openjdk/hotspot/src/share/vm/runtime/frame.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp 2010-04-17 02:15:34.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-04-18 17:37:54.000000000 +0100
-@@ -1212,6 +1212,10 @@
- oops_entry_do(f, map);
- } else if (CodeCache::contains(pc())) {
- oops_code_blob_do(f, cf, map);
-+#ifdef SHARK
-+ } else if (is_fake_stub_frame()) {
-+ // nothing to do
-+#endif // SHARK
- } else {
- ShouldNotReachHere();
- }
More information about the distro-pkg-dev
mailing list