/hg/icedtea6: Rebase HotSpot 23 support on version in 7u.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Aug 20 08:27:58 PDT 2013
changeset a4e16f083f3b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4e16f083f3b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Aug 20 16:27:39 2013 +0100
Rebase HotSpot 23 support on version in 7u.
2013-08-20 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add patches from IcedTea's
HotSpot 23 (mainly the ARM port work). Move
some patches back to being applied on both
versions of HotSpot.
(ports): Install ARM port in all builds.
(clean-ports): Likewise for uninstall.
* hotspot.map: Use HotSpot 23 from the 7u
tree.
* patches/arm/cc_compile-01.patch,
* patches/arm/cc_compile-02.patch,
* patches/arm/cc_compile-03.patch,
* patches/arm/cc_compile-04.patch,
* patches/arm/cc_compile-05.patch,
* patches/arm/cc_compile-06.patch,
* patches/hotspot/hs23/7188168-fix_debug_binaries.patch,
* patches/hotspot/hs23/aarch64.patch:
Patches from IcedTea's 2.3.x HotSpot.
* patches/hotspot/original/alpha-fixes.patch,
* patches/hotspot/hs23/alpha-fixes.patch:
Split from patches/alpha-fixes.patch.
* patches/hotspot/hs23/arm-01-hsx22.patch,
* patches/hotspot/hs23/arm-03-invokedynamic.patch,
* patches/hotspot/hs23/arm-04-invokedynamic_jit.patch,
* patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch,
* patches/hotspot/hs23/arm-06-no_o0.patch,
* patches/hotspot/hs23/arm-07-cleanup.patch,
* patches/hotspot/hs23/arm-08-cleanup.patch,
* patches/hotspot/hs23/arm-09-jvmti.patch,
* patches/hotspot/hs23/arm-10-memory_protect.patch,
* patches/hotspot/hs23/arm-11-thumb2_jit.patch,
* patches/hotspot/hs23/arm-12-ldrexd.patch,
* patches/hotspot/hs23/arm-13-sp_adjustment.patch,
* patches/hotspot/hs23/arm-14-stage1.patch,
* patches/hotspot/hs23/arm-15-stage2.patch,
* patches/hotspot/hs23/arm-16-dont_save_locals.patch,
* patches/hotspot/hs23/arm-17-no_debug_code.patch,
* patches/hotspot/hs23/arm-18-correct_call.patch,
* patches/hotspot/hs23/arm-19-fix_jit_bug.patch,
* patches/hotspot/hs23/arm-20-function_renaming.patch,
* patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch,
* patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch,
* patches/hotspot/hs23/arm-25-hsx23.patch:
HotSpot 23 only ARM port work.
* patches/hotspot/hs23/arm-hsdis.patch:
HotSpot 23 version of hsdis patch.
* patches/hotspot/original/arm.patch,
* patches/hotspot/hs23/arm.patch,
Split from patches/arm.patch.
* patches/hotspot/hs23/drop_unlicensed_test.patch:
Patches from IcedTea's 2.3.x HotSpot.
* patches/hotspot/original/gcc-suffix.patch,
* patches/hotspot/hs23/gcc-suffix.patch:
Split from patches/gcc-suffix-hotspot.patch.
* patches/hotspot/original/jtreg-test7020373-fix.patch,
* patches/hotspot/hs23/jtreg-test7020373-fix.patch:
Split from patches/jtreg-hotspot-Test7020373-fix.patch.
* patches/hotspot/hs23/no_useless_debuginfo_files.patch,
* patches/hotspot/hs23/pr1101-sparc_symbols.patch:
From IcedTea 2.3.x HotSpot.
* patches/hotspot/original/text-relocations.patch:
* patches/hotspot/hs23/text-relocations.patch:
Split from patches/text-relocations.patch.
* patches/hotspot/hs23/type_fixes.patch:
From IcedTea 2.3.x HotSpot.
* patches/hotspot/original/update-bootclasspath.patch,
* patches/hotspot/hs23/update-bootclasspath.patch:
Split from patches/update-bootclasspath.patch.
* patches/hotspot/original/version.patch,
* patches/hotspot/hs23/version.patch:
Split from patches/version-hotspot.patch.
* patches/hotspot/hs23/zero_fixes.patch,
* patches/hotspot/hs23/zero_hs22.patch:
HotSpot 23 only Zero work.
* patches/hotspot/original/7032696-7029152_broke_vm.patch:
Backported from 7u.
* patches/hotspot/original/7140985-hsdis_caller_options.patch:
Upstream version of part of the arm-hsdis patch.
* patches/hotspot/original/arm-hsdis.patch:
Remove 7140985 fragment.
* patches/pr1095-werror.patch: Apply to both HotSpots.
diffstat:
ChangeLog | 84 +
Makefile.am | 84 +-
hotspot.map | 2 +-
patches/alpha-fixes.patch | 21 -
patches/arm.patch | 286 -
patches/arm/cc_compile-01.patch | 23 +
patches/arm/cc_compile-02.patch | 46 +
patches/arm/cc_compile-03.patch | 21 +
patches/arm/cc_compile-04.patch | 20 +
patches/arm/cc_compile-05.patch | 29 +
patches/arm/cc_compile-06.patch | 20 +
patches/gcc-suffix-hotspot.patch | 31 -
patches/hotspot/hs23/7188168-fix_debug_binaries.patch | 120 +
patches/hotspot/hs23/aarch64.patch | 42 +
patches/hotspot/hs23/alpha-fixes.patch | 21 +
patches/hotspot/hs23/arm-01-hsx22.patch | 189 +
patches/hotspot/hs23/arm-03-invokedynamic.patch | 171 +
patches/hotspot/hs23/arm-04-invokedynamic_jit.patch | 322 +
patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch | 40 +
patches/hotspot/hs23/arm-06-no_o0.patch | 32 +
patches/hotspot/hs23/arm-07-cleanup.patch | 153 +
patches/hotspot/hs23/arm-08-cleanup.patch | 29 +
patches/hotspot/hs23/arm-09-jvmti.patch | 256 +
patches/hotspot/hs23/arm-10-memory_protect.patch | 247 +
patches/hotspot/hs23/arm-11-thumb2_jit.patch | 10888 ++++++++++
patches/hotspot/hs23/arm-12-ldrexd.patch | 28 +
patches/hotspot/hs23/arm-13-sp_adjustment.patch | 31 +
patches/hotspot/hs23/arm-14-stage1.patch | 135 +
patches/hotspot/hs23/arm-15-stage2.patch | 56 +
patches/hotspot/hs23/arm-16-dont_save_locals.patch | 263 +
patches/hotspot/hs23/arm-17-no_debug_code.patch | 206 +
patches/hotspot/hs23/arm-18-correct_call.patch | 19 +
patches/hotspot/hs23/arm-19-fix_jit_bug.patch | 59 +
patches/hotspot/hs23/arm-20-function_renaming.patch | 377 +
patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch | 52 +
patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch | 24 +
patches/hotspot/hs23/arm-25-hsx23.patch | 53 +
patches/hotspot/hs23/arm-hsdis.patch | 63 +
patches/hotspot/hs23/arm.patch | 295 +
patches/hotspot/hs23/drop_unlicensed_test.patch | 43 +
patches/hotspot/hs23/gcc-suffix.patch | 35 +
patches/hotspot/hs23/jtreg-test7020373-fix.patch | 187 +
patches/hotspot/hs23/no_useless_debuginfo_files.patch | 211 +
patches/hotspot/hs23/pr1101-sparc_symbols.patch | 57 +
patches/hotspot/hs23/text-relocations.patch | 40 +
patches/hotspot/hs23/type_fixes.patch | 192 +
patches/hotspot/hs23/update-bootclasspath.patch | 13 +
patches/hotspot/hs23/version.patch | 56 +
patches/hotspot/hs23/zero_fixes.patch | 644 +
patches/hotspot/hs23/zero_hs22.patch | 216 +
patches/hotspot/original/7032696-7029152_broke_vm.patch | 52 +
patches/hotspot/original/7140985-hsdis_caller_options.patch | 23 +
patches/hotspot/original/alpha-fixes.patch | 21 +
patches/hotspot/original/arm-hsdis.patch | 10 -
patches/hotspot/original/arm.patch | 286 +
patches/hotspot/original/gcc-suffix.patch | 31 +
patches/hotspot/original/jtreg-test7020373-fix.patch | 187 +
patches/hotspot/original/text-relocations.patch | 63 +
patches/hotspot/original/update-bootclasspath.patch | 13 +
patches/hotspot/original/version.patch | 56 +
patches/jtreg-hotspot-Test7020373-fix.patch | 187 -
patches/pr1095-werror.patch | 64 +
patches/text-relocations.patch | 63 -
patches/update-bootclasspath.patch | 13 -
patches/version-hotspot.patch | 56 -
65 files changed, 16965 insertions(+), 692 deletions(-)
diffs (truncated from 17991 to 500 lines):
diff -r e565715c45a7 -r a4e16f083f3b ChangeLog
--- a/ChangeLog Wed Aug 14 17:20:44 2013 +0200
+++ b/ChangeLog Tue Aug 20 16:27:39 2013 +0100
@@ -1,3 +1,87 @@
+2013-08-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patches from IcedTea's
+ HotSpot 23 (mainly the ARM port work). Move
+ some patches back to being applied on both
+ versions of HotSpot.
+ (ports): Install ARM port in all builds.
+ (clean-ports): Likewise for uninstall.
+ * hotspot.map: Use HotSpot 23 from the 7u
+ tree.
+ * patches/arm/cc_compile-01.patch,
+ * patches/arm/cc_compile-02.patch,
+ * patches/arm/cc_compile-03.patch,
+ * patches/arm/cc_compile-04.patch,
+ * patches/arm/cc_compile-05.patch,
+ * patches/arm/cc_compile-06.patch,
+ * patches/hotspot/hs23/7188168-fix_debug_binaries.patch,
+ * patches/hotspot/hs23/aarch64.patch:
+ Patches from IcedTea's 2.3.x HotSpot.
+ * patches/hotspot/original/alpha-fixes.patch,
+ * patches/hotspot/hs23/alpha-fixes.patch:
+ Split from patches/alpha-fixes.patch.
+ * patches/hotspot/hs23/arm-01-hsx22.patch,
+ * patches/hotspot/hs23/arm-03-invokedynamic.patch,
+ * patches/hotspot/hs23/arm-04-invokedynamic_jit.patch,
+ * patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch,
+ * patches/hotspot/hs23/arm-06-no_o0.patch,
+ * patches/hotspot/hs23/arm-07-cleanup.patch,
+ * patches/hotspot/hs23/arm-08-cleanup.patch,
+ * patches/hotspot/hs23/arm-09-jvmti.patch,
+ * patches/hotspot/hs23/arm-10-memory_protect.patch,
+ * patches/hotspot/hs23/arm-11-thumb2_jit.patch,
+ * patches/hotspot/hs23/arm-12-ldrexd.patch,
+ * patches/hotspot/hs23/arm-13-sp_adjustment.patch,
+ * patches/hotspot/hs23/arm-14-stage1.patch,
+ * patches/hotspot/hs23/arm-15-stage2.patch,
+ * patches/hotspot/hs23/arm-16-dont_save_locals.patch,
+ * patches/hotspot/hs23/arm-17-no_debug_code.patch,
+ * patches/hotspot/hs23/arm-18-correct_call.patch,
+ * patches/hotspot/hs23/arm-19-fix_jit_bug.patch,
+ * patches/hotspot/hs23/arm-20-function_renaming.patch,
+ * patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch,
+ * patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch,
+ * patches/hotspot/hs23/arm-25-hsx23.patch:
+ HotSpot 23 only ARM port work.
+ * patches/hotspot/hs23/arm-hsdis.patch:
+ HotSpot 23 version of hsdis patch.
+ * patches/hotspot/original/arm.patch,
+ * patches/hotspot/hs23/arm.patch,
+ Split from patches/arm.patch.
+ * patches/hotspot/hs23/drop_unlicensed_test.patch:
+ Patches from IcedTea's 2.3.x HotSpot.
+ * patches/hotspot/original/gcc-suffix.patch,
+ * patches/hotspot/hs23/gcc-suffix.patch:
+ Split from patches/gcc-suffix-hotspot.patch.
+ * patches/hotspot/original/jtreg-test7020373-fix.patch,
+ * patches/hotspot/hs23/jtreg-test7020373-fix.patch:
+ Split from patches/jtreg-hotspot-Test7020373-fix.patch.
+ * patches/hotspot/hs23/no_useless_debuginfo_files.patch,
+ * patches/hotspot/hs23/pr1101-sparc_symbols.patch:
+ From IcedTea 2.3.x HotSpot.
+ * patches/hotspot/original/text-relocations.patch:
+ * patches/hotspot/hs23/text-relocations.patch:
+ Split from patches/text-relocations.patch.
+ * patches/hotspot/hs23/type_fixes.patch:
+ From IcedTea 2.3.x HotSpot.
+ * patches/hotspot/original/update-bootclasspath.patch,
+ * patches/hotspot/hs23/update-bootclasspath.patch:
+ Split from patches/update-bootclasspath.patch.
+ * patches/hotspot/original/version.patch,
+ * patches/hotspot/hs23/version.patch:
+ Split from patches/version-hotspot.patch.
+ * patches/hotspot/hs23/zero_fixes.patch,
+ * patches/hotspot/hs23/zero_hs22.patch:
+ HotSpot 23 only Zero work.
+ * patches/hotspot/original/7032696-7029152_broke_vm.patch:
+ Backported from 7u.
+ * patches/hotspot/original/7140985-hsdis_caller_options.patch:
+ Upstream version of part of the arm-hsdis patch.
+ * patches/hotspot/original/arm-hsdis.patch:
+ Remove 7140985 fragment.
+ * patches/pr1095-werror.patch: Apply to both HotSpots.
+
2013-08-14 Xerxes RÃ¥nby <xerxes at zafena.se>
Robert Lougher <rob at jamvm.org.uk>
diff -r e565715c45a7 -r a4e16f083f3b Makefile.am
--- a/Makefile.am Wed Aug 14 17:20:44 2013 +0200
+++ b/Makefile.am Tue Aug 20 16:27:39 2013 +0100
@@ -717,34 +717,75 @@
patches/openjdk/8009987-tzdata2013b.patch \
patches/openjdk/7196533-timezone_bottleneck.patch \
patches/openjdk/6636370-appcontext_simplification.patch \
- patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch
+ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \
+ patches/sparc-ptracefix.patch \
+ patches/hotspot/$(HSBUILD)/alpha-fixes.patch \
+ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
+ patches/hotspot/$(HSBUILD)/text-relocations.patch \
+ patches/hotspot/$(HSBUILD)/version.patch \
+ patches/memory-limits.patch \
+ patches/sh4-support.patch \
+ patches/hotspot/$(HSBUILD)/aarch64.patch \
+ patches/hotspot/$(HSBUILD)/arm.patch \
+ patches/arm-debug.patch \
+ patches/hotspot/$(HSBUILD)/jtreg-test7020373-fix.patch \
+ patches/jtreg-6929067-fix.patch \
+ patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
+ patches/hotspot/original/jvmtiEnv.patch \
+ patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
+ patches/sparc-trapsfix.patch \
+ patches/print_lsb_release.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
patches/hotspot/hs23/remove_jsr292_tests.patch \
- patches/hotspot/hs23/revert-7017193.patch
+ patches/hotspot/hs23/revert-7017193.patch \
+ patches/hotspot/hs23/7188168-fix_debug_binaries.patch \
+ patches/hotspot/hs23/arm-01-hsx22.patch \
+ patches/hotspot/hs23/arm-03-invokedynamic.patch \
+ patches/hotspot/hs23/arm-04-invokedynamic_jit.patch \
+ patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch \
+ patches/hotspot/hs23/arm-06-no_o0.patch \
+ patches/hotspot/hs23/arm-07-cleanup.patch \
+ patches/hotspot/hs23/arm-08-cleanup.patch \
+ patches/hotspot/hs23/arm-09-jvmti.patch \
+ patches/hotspot/hs23/arm-10-memory_protect.patch \
+ patches/hotspot/hs23/arm-11-thumb2_jit.patch \
+ patches/hotspot/hs23/arm-12-ldrexd.patch \
+ patches/hotspot/hs23/arm-13-sp_adjustment.patch \
+ patches/hotspot/hs23/arm-14-stage1.patch \
+ patches/hotspot/hs23/arm-15-stage2.patch \
+ patches/hotspot/hs23/arm-16-dont_save_locals.patch \
+ patches/hotspot/hs23/arm-17-no_debug_code.patch \
+ patches/hotspot/hs23/arm-18-correct_call.patch \
+ patches/hotspot/hs23/arm-19-fix_jit_bug.patch \
+ patches/hotspot/hs23/arm-20-function_renaming.patch \
+ patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch \
+ patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch \
+ patches/hotspot/hs23/arm-25-hsx23.patch \
+ patches/hotspot/hs23/drop_unlicensed_test.patch \
+ patches/hotspot/hs23/no_useless_debuginfo_files.patch \
+ patches/hotspot/hs23/pr1101-sparc_symbols.patch \
+ patches/hotspot/hs23/type_fixes.patch \
+ patches/hotspot/hs23/zero_hs22.patch \
+ patches/hotspot/hs23/zero_fixes.patch \
+ patches/pr1095-werror.patch \
+ patches/arm/cc_compile-01.patch \
+ patches/arm/cc_compile-02.patch \
+ patches/arm/cc_compile-03.patch \
+ patches/arm/cc_compile-04.patch \
+ patches/arm/cc_compile-05.patch \
+ patches/arm/cc_compile-06.patch
else
# stdc-limit-macros is part of 7032458
# pr690-shark-jit-hs20.patch is part of 7032458
# pr696-zero-fast_aldc-hs20.patch is 7030207 & part of 7032458
ICEDTEA_PATCHES += \
patches/stdc-limit-macros.patch \
- patches/version-hotspot.patch \
- patches/text-relocations.patch \
- patches/gcc-suffix-hotspot.patch \
- patches/memory-limits.patch \
- patches/print_lsb_release.patch \
- patches/alpha-fixes.patch \
patches/use-idx_t.patch \
patches/params-cast-size_t.patch \
- patches/sparc-ptracefix.patch \
- patches/sparc-trapsfix.patch \
patches/openjdk/7019808-stack_noexec.patch \
- patches/sh4-support.patch \
- patches/update-bootclasspath.patch \
- patches/arm.patch \
patches/numa_on_early_glibc.patch \
- patches/jtreg-6929067-fix.patch \
patches/ia64-fix.patch \
patches/openjdk/7041156-gcc_export_dynamic.patch \
patches/openjdk/7032388-work_without_cmov_instruction.patch \
@@ -760,20 +801,19 @@
patches/jtreg-remove-test-6991596.patch \
patches/openjdk/7036220-shark_llvm_29_headers.patch \
patches/openjdk/7029152-String_intrinsics_miss_optimization.patch \
- patches/jtreg-hotspot-Test7020373-fix.patch \
patches/pr690-shark-jit-hs20.patch \
patches/pr696-zero-fast_aldc-hs20.patch \
- patches/arm-debug.patch \
patches/openjdk/7010849-modernise_sa.patch \
- patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
patches/hotspot/original/fix_get_stack_bounds_leak.patch \
- patches/hotspot/original/jvmtiEnv.patch \
patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
- patches/hotspot/original/aarch64.patch \
+ patches/hotspot/original/7032696-7029152_broke_vm.patch \
patches/hotspot/original/7022999-fastlocking_compiler1_only.patch \
- patches/hotspot/original/arm-hsdis.patch
+ patches/hotspot/original/7140985-hsdis_caller_options.patch
endif
+ICEDTEA_PATCHES += \
+ patches/hotspot/$(HSBUILD)/arm-hsdis.patch
+
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/rhino.patch
@@ -1386,25 +1426,21 @@
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
-if !WITH_ALT_HSBUILD
for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
$(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
cp -rv $(SRC_DIR_LINK) $$target $$link; \
chmod -R ug+rwX $$link; \
done
-endif
mkdir -p stamps
touch stamps/ports.stamp
clean-ports:
-if !WITH_ALT_HSBUILD
for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
$(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
rm -rf $$link; \
done
-endif
rm -f stamps/ports.stamp
stamps/generated.stamp: stamps/ports.stamp
diff -r e565715c45a7 -r a4e16f083f3b hotspot.map
--- a/hotspot.map Wed Aug 14 17:20:44 2013 +0200
+++ b/hotspot.map Tue Aug 20 16:27:39 2013 +0100
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a6502a8a6b31 5c73225a03c33109a4cbea6274bf5af634a14feddb80ed7471af0c1445c93204
+hs23 http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot jdk7u25-b15 3abb5efce289b1ac267d69410ed58e7c97e92bd9331a51c0f229b68ad9adc901
diff -r e565715c45a7 -r a4e16f083f3b patches/alpha-fixes.patch
--- a/patches/alpha-fixes.patch Wed Aug 14 17:20:44 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2010-09-19 14:44:40.000000000 +0100
-+++ openjdk/hotspot/agent/src/os/linux/Makefile 2010-09-19 15:34:47.064793576 +0100
-@@ -40,7 +40,7 @@
-
- LIBS = -lthread_db
-
--CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
-+CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES)
-
- LIBSA = $(ARCH)/libsaproc.so
-
-@@ -73,7 +73,7 @@
- $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
-
- test.o: test.c
-- $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
-+ $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c
-
- test: test.o
- $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
diff -r e565715c45a7 -r a4e16f083f3b patches/arm.patch
--- a/patches/arm.patch Wed Aug 14 17:20:44 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2010-05-28 11:09:25.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2010-06-17 17:28:03.000000000 +0100
-@@ -25,6 +25,41 @@
-
- # Setup common to Zero (non-Shark) and Shark versions of VM
-
-+ifeq ($(ZERO_LIBARCH),arm)
-+
-+Obj_Files += asm_helper.o
-+Obj_Files += cppInterpreter_arm.o
-+Obj_Files += thumb2.o
-+
-+CFLAGS += -DHOTSPOT_ASM
-+
-+cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
-+thumb2.o: offsets_arm.s
-+
-+offsets_arm.s: mkoffsets
-+ @echo Generating assembler offsets
-+ ./mkoffsets > $@
-+
-+bytecodes_arm.s: bytecodes_arm.def mkbc
-+ @echo Generatine ARM assembler bytecode sequences
-+ $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
-+
-+mkbc: $(GAMMADIR)/tools/mkbc.c
-+ @echo Compiling mkbc tool
-+ $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
-+
-+mkoffsets: asm_helper.cpp
-+ @echo Compiling offset generator
-+ $(QUIETLY) $(REMOVE_TARGET)
-+ $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
-+
-+endif
-+
-+%.o: %.S
-+ @echo Assembling $<
-+ $(QUIETLY) $(REMOVE_TARGET)
-+ $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
-+
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
- # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp 2010-05-28 11:10:30.000000000 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp 2010-06-17 17:29:30.000000000 +0100
-@@ -1,6 +1,7 @@
- /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007 Red Hat, Inc.
-+ * Copyright 2009 Edward Nevill
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -27,5 +28,54 @@
- #include "incls/_bytecodes_zero.cpp.incl"
-
- void Bytecodes::pd_initialize() {
-- // No zero specific initialization
-+#ifdef HOTSPOT_ASM
-+ // Because iaccess_N can trap, we must say aload_N can trap, otherwise
-+ // we get an assertion failure
-+ def(_aload_1, "aload_1", "b", NULL, T_OBJECT , 1, true);
-+ def(_aload_2, "aload_2", "b", NULL, T_OBJECT , 1, true);
-+ def(_aload_3, "aload_3", "b", NULL, T_OBJECT , 1, true);
-+
-+ def(_iaccess_0, "_iaccess_0", "b_jj", NULL, T_INT, 1, true, _aload_0);
-+ def(_iaccess_1, "_iaccess_1", "b_jj", NULL, T_INT, 1, true, _aload_1);
-+ def(_iaccess_2, "_iaccess_2", "b_jj", NULL, T_INT, 1, true, _aload_2);
-+ def(_iaccess_3, "_iaccess_3", "b_jj", NULL, T_INT, 1, true, _aload_3);
-+
-+ def(_invokeresolved, "invokeresolved", "bjj", NULL, T_ILLEGAL, -1, true, _invokevirtual);
-+ def(_invokespecialresolved, "invokespecialresolved", "bjj", NULL, T_ILLEGAL, -1, true, _invokespecial);
-+ def(_invokestaticresolved, "invokestaticresolved", "bjj", NULL, T_ILLEGAL, 0, true, _invokestatic);
-+
-+ def(_dmac, "dmac", "b_", NULL, T_DOUBLE, -16, false, _dmul);
-+
-+ def(_iload_iload, "iload_iload", "bi_i",NULL, T_INT, 2, false, _iload);
-+ def(_iload_iload_N, "iload_iload_N", "bi_", NULL, T_INT, 2, false, _iload);
-+
-+ def(_iload_0_iconst_N, "iload_0_iconst_N", "b_", NULL, T_INT, 2, false, _iload_0);
-+ def(_iload_1_iconst_N, "iload_1_iconst_N", "b_", NULL, T_INT, 2, false, _iload_1);
-+ def(_iload_2_iconst_N, "iload_2_iconst_N", "b_", NULL, T_INT, 2, false, _iload_2);
-+ def(_iload_3_iconst_N, "iload_3_iconst_N", "b_", NULL, T_INT, 2, false, _iload_3);
-+ def(_iload_iconst_N, "iload_iconst_N", "bi_", NULL, T_INT, 2, false, _iload);
-+
-+ def(_iadd_istore_N, "iadd_istore_N", "b_", NULL, T_VOID, -2, false, _iadd);
-+ def(_isub_istore_N, "isub_istore_N", "b_", NULL, T_VOID, -2, false, _isub);
-+ def(_iand_istore_N, "iand_istore_N", "b_", NULL, T_VOID, -2, false, _iand);
-+ def(_ior_istore_N, "ior_istore_N", "b_", NULL, T_VOID, -2, false, _ior);
-+ def(_ixor_istore_N, "ixor_istore_N", "b_", NULL, T_VOID, -2, false, _ixor);
-+
-+ def(_iadd_u4store, "iadd_u4store", "b_i", NULL, T_VOID, -2, false, _iadd);
-+ def(_isub_u4store, "isub_u4store", "b_i", NULL, T_VOID, -2, false, _isub);
-+ def(_iand_u4store, "iand_u4store", "b_i", NULL, T_VOID, -2, false, _iand);
-+ def(_ior_u4store, "ior_u4store", "b_i", NULL, T_VOID, -2, false, _ior);
-+ def(_ixor_u4store, "ixor_u4store", "b_i", NULL, T_VOID, -2, false, _ixor);
-+
-+ def(_iload_0_iload, "iload_0_iload", "b_i", NULL, T_INT, 2, false, _iload_0);
-+ def(_iload_1_iload, "iload_1_iload", "b_i", NULL, T_INT, 2, false, _iload_1);
-+ def(_iload_2_iload, "iload_2_iload", "b_i", NULL, T_INT, 2, false, _iload_2);
-+ def(_iload_3_iload, "iload_3_iload", "b_i", NULL, T_INT, 2, false, _iload_3);
-+
-+ def(_iload_0_iload_N, "iload_0_iload_N", "b_", NULL, T_INT, 2, false, _iload_0);
-+ def(_iload_1_iload_N, "iload_1_iload_N", "b_", NULL, T_INT, 2, false, _iload_1);
-+ def(_iload_2_iload_N, "iload_2_iload_N", "b_", NULL, T_INT, 2, false, _iload_2);
-+ def(_iload_3_iload_N, "iload_3_iload_N", "b_", NULL, T_INT, 2, false, _iload_3);
-+
-+#endif // HOTSPOT_ASM
- }
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-06-16 14:11:07.000000000 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-06-17 17:30:02.000000000 +0100
-@@ -724,10 +724,21 @@
- return generate_entry((address) CppInterpreter::normal_entry);
- }
-
-+#ifdef HOTSPOT_ASM
-+extern "C" address asm_generate_method_entry(
-+ AbstractInterpreter::MethodKind kind);
-+#endif // HOTSPOT_ASM
-+
- address AbstractInterpreterGenerator::generate_method_entry(
- AbstractInterpreter::MethodKind kind) {
- address entry_point = NULL;
-
-+#ifdef HOTSPOT_ASM
-+ address asm_entry = asm_generate_method_entry(kind);
-+ if (asm_entry)
-+ return ((InterpreterGenerator*) this)->generate_entry(asm_entry);
-+#endif // HOTSPOT_ASM
-+
- switch (kind) {
- case Interpreter::zerolocals:
- case Interpreter::zerolocals_synchronized:
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-05-28 11:11:05.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-06-17 17:27:35.000000000 +0100
-@@ -82,6 +82,10 @@
- ShouldNotCallThis();
- }
-
-+#ifdef HOTSPOT_ASM
-+extern "C" int asm_check_null_ptr(ucontext_t *uc);
-+#endif // HOTSPOT_ASM
-+
- extern "C" int
- JVM_handle_linux_signal(int sig,
- siginfo_t* info,
-@@ -89,6 +93,12 @@
- int abort_if_unrecognized) {
- ucontext_t* uc = (ucontext_t*) ucVoid;
-
-+#ifdef HOTSPOT_ASM
-+ if (sig == SIGSEGV) {
-+ if (asm_check_null_ptr(uc)) return 1;
-+ }
-+#endif // HOTSPOT_ASM
-+
- Thread* t = ThreadLocalStorage::get_thread_slow();
-
- SignalHandlerMark shm(t);
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-25 22:57:24.000000000 +0000
-+++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-28 01:46:18.769782690 +0000
-@@ -1,6 +1,7 @@
- /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2009 Red Hat, Inc.
-+ * Copyright 2009 Edward Nevill
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -26,6 +27,44 @@
- #ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP
- #define CPU_ZERO_VM_BYTECODES_ZERO_HPP
-
--// This file is intentionally empty
-+#ifdef HOTSPOT_ASM
-+#define _iaccess_0 ((Bytecodes::Code)0xdb)
-+#define _iaccess_1 ((Bytecodes::Code)0xdc)
-+#define _iaccess_2 ((Bytecodes::Code)0xdd)
-+#define _iaccess_3 ((Bytecodes::Code)0xde)
-+
-+#define _invokeresolved ((Bytecodes::Code)0xdf)
-+#define _invokespecialresolved ((Bytecodes::Code)0xe0)
-+#define _invokestaticresolved ((Bytecodes::Code)0xe1)
-+
-+#define _iload_iload ((Bytecodes::Code)0xe3)
-+#define _iload_iload_N ((Bytecodes::Code)0xe4)
-+
-+#define _dmac ((Bytecodes::Code)0xe8)
-+
-+ _iload_0_iconst_N , // 233 0xe9
-+ _iload_1_iconst_N , // 234 0xea
-+ _iload_2_iconst_N , // 235 0xeb
-+ _iload_3_iconst_N , // 236 0xec
-+ _iload_iconst_N , // 237 0xed
-+ _iadd_istore_N , // 238 0xee
-+ _isub_istore_N , // 239 0xef
-+ _iand_istore_N , // 240 0xf0
-+ _ior_istore_N , // 241 0xf1
-+ _ixor_istore_N , // 242 0xf2
-+ _iadd_u4store , // 243 0xf3
-+ _isub_u4store , // 244 0xf4
-+ _iand_u4store , // 245 0xf5
-+ _ior_u4store , // 246 0xf6
-+ _ixor_u4store , // 247 0xf7
-+ _iload_0_iload , // 248 0xf8
-+ _iload_1_iload , // 249 0xf9
-+ _iload_2_iload , // 250 0xfa
-+ _iload_3_iload , // 251 0xfb
-+ _iload_0_iload_N , // 252 0xfc
-+ _iload_1_iload_N , // 253 0xfd
-+ _iload_2_iload_N , // 254 0xfe
-+ _iload_3_iload_N , // 255 0xff
-+#endif // HOTSPOT_ASM
-
- #endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP
---- openjdk/hotspot/make/linux/makefiles/vm.make 2011-09-16 14:22:51.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make 2011-09-16 16:04:50.000000000 +0100
-@@ -183,7 +183,7 @@
- # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
- define findsrc
- $(notdir $(shell find $(1)/. ! -name . -prune \
-- -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
More information about the distro-pkg-dev
mailing list