summaryrefslogtreecommitdiffstats
path: root/source.local/l/openjdk/patches
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-03-22 16:47:17 -0700
committer Eric Hameleers <alien@slackware.com>2013-03-22 16:47:17 -0700
commit69dd99f961988fa15da8d7f0d63b62f3385419c3 (patch)
treed57eb3e85e1d08e7815787de26946ee42c398b66 /source.local/l/openjdk/patches
downloadalienarm-69dd99f961988fa15da8d7f0d63b62f3385419c3.tar.gz
alienarm-69dd99f961988fa15da8d7f0d63b62f3385419c3.tar.xz
Initial commit of a Slackware cross-arch bootstrap framework.
Diffstat (limited to 'source.local/l/openjdk/patches')
-rw-r--r--source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch23
-rw-r--r--source.local/l/openjdk/patches/icedtea_zero_debuginfo.patch53
-rw-r--r--source.local/l/openjdk/patches/openjdk.arm_fixes.patch44
3 files changed, 120 insertions, 0 deletions
diff --git a/source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch b/source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch
new file mode 100644
index 0000000..b9e059f
--- /dev/null
+++ b/source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch
@@ -0,0 +1,23 @@
+Index: icedtea-2.3.3/patches/hotspot/zero/6924259-string_offset.patch
+===================================================================
+--- icedtea-2.3.3.orig/patches/hotspot/zero/6924259-string_offset.patch 2012-10-17 10:20:09.779948816 +0200
++++ icedtea-2.3.3/patches/hotspot/zero/6924259-string_offset.patch 2012-10-19 14:56:22.265958143 +0200
+@@ -378,7 +378,7 @@
+ diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp
+ --- openjdk/hotspot/src/share/vm/memory/dump.cpp
+ +++ openjdk/hotspot/src/share/vm/memory/dump.cpp
+-@@ -78,8 +78,8 @@
++@@ -78,8 +78,8 @@ public:
+ void do_oop(oop* p) {
+ if (p != NULL) {
+ oop obj = *p;
+@@ -386,7 +386,7 @@
+ -
+ + if (obj->klass() == SystemDictionary::String_klass() &&
+ + java_lang_String::has_hash_field()) {
+- int hash = java_lang_String::hash_string(obj);
++ int hash = java_lang_String::to_hash(obj);
+ obj->int_field_put(hash_offset, hash);
+ }
+ diff --git a/src/share/vm/opto/graphKit.cpp b/src/share/vm/opto/graphKit.cpp
+
diff --git a/source.local/l/openjdk/patches/icedtea_zero_debuginfo.patch b/source.local/l/openjdk/patches/icedtea_zero_debuginfo.patch
new file mode 100644
index 0000000..68b0e44
--- /dev/null
+++ b/source.local/l/openjdk/patches/icedtea_zero_debuginfo.patch
@@ -0,0 +1,53 @@
+--- openjdk/hotspot/make/linux/makefiles/defs.make.orig 2012-02-15 09:26:53.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make 2012-03-18 23:22:09.000000000 +0100
+@@ -132,7 +132,7 @@
+ # Full Debug Symbols is supported on JDK7 or newer
+
+ # Default OBJCOPY comes from GNU Binutils on Linux:
+- DEF_OBJCOPY=/usr/bin/objcopy
++ DEF_OBJCOPY=feck
+ ifdef CROSS_COMPILE_ARCH
+ # don't try to generate .debuginfo files when cross compiling
+ _JUNK_ := $(shell \
+@@ -215,10 +215,10 @@
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+-ifneq ($(OBJCOPY),)
+- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+-endif
++#ifneq ($(OBJCOPY),)
++# ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++# ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++#endif
+ ADD_SA_BINARIES/ppc =
+ ADD_SA_BINARIES/ia64 =
+ ADD_SA_BINARIES/arm =
+
+--- openjdk-boot/hotspot/make/linux/makefiles/defs.make.orig 2012-02-15 09:26:53.000000000 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/defs.make 2012-03-18 23:22:09.000000000 +0100
+@@ -132,7 +132,7 @@
+ # Full Debug Symbols is supported on JDK7 or newer
+
+ # Default OBJCOPY comes from GNU Binutils on Linux:
+- DEF_OBJCOPY=/usr/bin/objcopy
++ DEF_OBJCOPY=feck
+ ifdef CROSS_COMPILE_ARCH
+ # don't try to generate .debuginfo files when cross compiling
+ _JUNK_ := $(shell \
+@@ -215,10 +215,10 @@
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+-ifneq ($(OBJCOPY),)
+- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+-endif
++#ifneq ($(OBJCOPY),)
++# ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++# ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++#endif
+ ADD_SA_BINARIES/ppc =
+ ADD_SA_BINARIES/ia64 =
+ ADD_SA_BINARIES/arm =
diff --git a/source.local/l/openjdk/patches/openjdk.arm_fixes.patch b/source.local/l/openjdk/patches/openjdk.arm_fixes.patch
new file mode 100644
index 0000000..47f28dc
--- /dev/null
+++ b/source.local/l/openjdk/patches/openjdk.arm_fixes.patch
@@ -0,0 +1,44 @@
+diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500
+@@ -814,12 +814,12 @@ ifdef OPENJDK
+ @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
+ $(ECHO) "Failed to build freetypecheck." ) > $@
+
+- sane-freetype: $(TEMPDIR)/freetypeinfo
+- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+- " or higher is required. \n" \
+- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
+- fi
++# sane-freetype: $(TEMPDIR)/freetypeinfo
++# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
++# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
++# " or higher is required. \n" \
++# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
++# fi
+ else
+ #do nothing (cross-compiling)
+ sane-freetype:
+diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-07 17:31:26.154840740 -0500
+@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
+
+ # ZERO_ENDIANNESS is the endianness of the processor
+ case "${ZERO_LIBARCH}" in
+- i386|amd64|ia64)
++ i386|amd64|ia64|arm)
+ ZERO_ENDIANNESS=little
+ ;;
+ ppc*|s390*|sparc*|alpha)
+@@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then
+ s390)
+ ZERO_ARCHFLAG="-m31"
+ ;;
++ arm)
++ ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
++ ;;
+ *)
+ ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
+ esac