/hg/icedtea6: Update to the version of hs23 which includes the A...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 18 12:04:02 PDT 2013
changeset 8da02dd9a76d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8da02dd9a76d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jul 18 20:03:43 2013 +0100
Update to the version of hs23 which includes the ARM32 port.
2013-07-18 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/hotspot/hs23/arm-hsdis.patch:
Removed.
* Makefile.am:
(ICEDTEA_PATCHES): Only apply original
arm-hsdis patch.
* hotspot.map: Update to latest HotSpot
from 2.3.x forest, which contains the ARM32
port.
diffstat:
ChangeLog | 11 +++++
Makefile.am | 4 +-
hotspot.map | 2 +-
patches/hotspot/hs23/arm-hsdis.patch | 72 ------------------------------------
4 files changed, 14 insertions(+), 75 deletions(-)
diffs (122 lines):
diff -r 5cba6fc13701 -r 8da02dd9a76d ChangeLog
--- a/ChangeLog Wed Jul 17 11:54:43 2013 -0400
+++ b/ChangeLog Thu Jul 18 20:03:43 2013 +0100
@@ -1,3 +1,14 @@
+2013-07-18 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/hotspot/hs23/arm-hsdis.patch:
+ Removed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Only apply original
+ arm-hsdis patch.
+ * hotspot.map: Update to latest HotSpot
+ from 2.3.x forest, which contains the ARM32
+ port.
+
2013-07-17 Omair Majid <omajid at redhat.com>
* patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in
diff -r 5cba6fc13701 -r 8da02dd9a76d Makefile.am
--- a/Makefile.am Wed Jul 17 11:54:43 2013 -0400
+++ b/Makefile.am Thu Jul 18 20:03:43 2013 +0100
@@ -603,7 +603,6 @@
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
- patches/hotspot/$(HSBUILD)/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
@@ -751,7 +750,8 @@
patches/hotspot/original/jvmtiEnv.patch \
patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
patches/hotspot/original/aarch64.patch \
- patches/hotspot/original/7022999-fastlocking_compiler1_only.patch
+ patches/hotspot/original/7022999-fastlocking_compiler1_only.patch \
+ patches/hotspot/original/arm-hsdis.patch
endif
if WITH_RHINO
diff -r 5cba6fc13701 -r 8da02dd9a76d hotspot.map
--- a/hotspot.map Wed Jul 17 11:54:43 2013 -0400
+++ b/hotspot.map Thu Jul 18 20:03:43 2013 +0100
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0
+hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305
diff -r 5cba6fc13701 -r 8da02dd9a76d patches/hotspot/hs23/arm-hsdis.patch
--- a/patches/hotspot/hs23/arm-hsdis.patch Wed Jul 17 11:54:43 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c
---- openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-11 23:08:47.000000000 +0000
-+++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-14 18:06:25.372022803 +0000
-@@ -35,6 +35,8 @@
- #include <dis-asm.h>
- #include <inttypes.h>
-
-+#include <string.h>
-+
- #ifndef bool
- #define bool int
- #define true 1
-@@ -356,7 +358,7 @@
- if (plen > mach_size) plen = mach_size;
- strncpy(mach_option, p, plen);
- mach_option[plen] = '\0';
-- } else if (plen > 6 && strncmp(p, "hsdis-", 6) == 0) {
-+ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) {
- // do not pass these to the next level
- } else {
- /* just copy it; {i386,sparc}-dis.c might like to see it */
-@@ -418,6 +420,9 @@
- #ifdef LIBARCH_sparcv9
- res = "sparc:v9b";
- #endif
-+#ifdef LIBARCH_arm
-+ res = "arm";
-+#endif
- if (res == NULL)
- res = "architecture not set in Makefile!";
- return res;
-diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile
---- openjdk.orig/hotspot/src/share/tools/hsdis/Makefile 2013-02-11 23:08:47.000000000 +0000
-+++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2013-02-14 18:05:21.514998150 +0000
-@@ -68,14 +68,18 @@
- CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW)
- else
- CPU = $(shell uname -m)
-+ifneq ($(findstring arm,$(CPU)),)
-+ARCH=arm
-+else
- ARCH1=$(CPU:x86_64=amd64)
- ARCH=$(ARCH1:i686=i386)
- CFLAGS/i386 += -m32
- CFLAGS/sparc += -m32
- CFLAGS/sparcv9 += -m64
- CFLAGS/amd64 += -m64
-+endif
- CFLAGS += $(CFLAGS/$(ARCH))
--CFLAGS += -fPIC
-+CFLAGS += -fPIC -g
- OS = linux
- LIB_EXT = .so
- CC = gcc
-@@ -118,7 +122,7 @@
- BINUTILSDIR = $(shell cd $(BINUTILS);pwd)
- endif
-
--CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd
-+CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd
- CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\"
-
- TARGET_DIR = build/$(OS)-$(JDKARCH)
-@@ -145,7 +149,7 @@
- demo: $(TARGET) $(DEMO_TARGET)
-
- $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile
-- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi
-+ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi
-
- $(TARGET_DIR)/Makefile:
- (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS))
More information about the distro-pkg-dev
mailing list