Mercurial > hg > release > icedtea6-1.3

changeset 81:6b3987f26dce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-07-11 Andrew Haley <aph@redhat.com> * patches/icedtea-assembler_amd64.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add icedtea-assembler_amd64.patch. (icedtea-debug): New target
author Andrew Haley <aph@redhat.com>
date Wed, 11 Jul 2007 18:43:31 +0100
parents 5465e5a55631
children 9176dcb9498f
files ChangeLog Makefile.am Makefile.in patches/icedtea-assembler_amd64.patch
diffstat 4 files changed, 36 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jul 08 16:01:54 2007 +0200
+++ b/ChangeLog	Wed Jul 11 18:43:31 2007 +0100
@@ -1,3 +1,9 @@
+2007-07-11  Andrew Haley  <aph@redhat.com>
+
+	* patches/icedtea-assembler_amd64.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Add icedtea-assembler_amd64.patch.
+	(cedtea-debug): New target 
+
 2007-07-08  Mark Wielaard  <mark@klomp.org>
 
 	* acinclude.m4 (FIND_TOOL): New macro.
--- a/Makefile.am	Sun Jul 08 16:01:54 2007 +0200
+++ b/Makefile.am	Wed Jul 11 18:43:31 2007 +0100
@@ -34,6 +34,7 @@
 	patches/icedtea-java.security.patch \
 	patches/icedtea-ssl.patch \
 	patches/icedtea-buildfix.patch \
+	patches/icedtea-assembler_amd64.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
@@ -403,6 +404,12 @@
 	  -C openjdk/control/make
 	@echo "IcedTea re-served:" openjdk/control/build/linux-$(BUILD_ARCH_DIR)
 
+icedtea-debug:
+	$(MAKE) debug_build \
+	  $(ICEDTEA_ENV) \
+	  -C openjdk/control/make
+	@echo "IcedTea is served:" openjdk/control/build/linux-$(BUILD_ARCH_DIR)-debug
+
 snapshot: dist
 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
 
--- a/Makefile.in	Sun Jul 08 16:01:54 2007 +0200
+++ b/Makefile.in	Wed Jul 11 18:43:31 2007 +0100
@@ -194,6 +194,7 @@
 	patches/icedtea-java.security.patch \
 	patches/icedtea-ssl.patch \
 	patches/icedtea-buildfix.patch \
+	patches/icedtea-assembler_amd64.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
@@ -829,6 +830,12 @@
 	  -C openjdk/control/make
 	@echo "IcedTea re-served:" openjdk/control/build/linux-$(BUILD_ARCH_DIR)
 
+icedtea-debug:
+	$(MAKE) debug_build \
+	  $(ICEDTEA_ENV) \
+	  -C openjdk/control/make
+	@echo "IcedTea is served:" openjdk/control/build/linux-$(BUILD_ARCH_DIR)
+
 snapshot: dist
 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-assembler_amd64.patch	Wed Jul 11 18:43:31 2007 +0100
@@ -0,0 +1,16 @@
+2007-07-11  Andrew Haley  <aph@redhat.com>
+
+	* openjdk/hotspot/src/cpu/amd64/vm/assembler_amd64.cpp 
+	(Assembler::check_relocation): Add 64-bit calls.
+
+*** openjdk/hotspot/src/cpu/amd64/vm/assembler_amd64.cpp~	2007-07-05 08:16:04.000000000 +0100
+--- openjdk/hotspot/src/cpu/amd64/vm/assembler_amd64.cpp	2007-07-11 17:33:58.000000000 +0100
+*************** void Assembler::check_relocation(Relocat
+*** 884,887 ****
+--- 884,889 ----
+    if (r->type() == relocInfo::none) {
+      return;
++   } else if (r->is_call() && format == imm64_operand) {
++     opnd = locate_operand(inst, imm64_operand);
+    } else if (r->is_call() || format == call32_operand) {
+      opnd = locate_operand(inst, call32_operand);