changeset in /hg/icedtea: 2008-02-15 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 29 14:11:55 PDT 2008
changeset 7265512f3f6f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7265512f3f6f
description:
2008-02-15 Lillian Angel <langel at redhat.com>
* acinclude.m4: Added configure msg.
* configure: Regenerated.
* patches/icedtea-always-zero.patch: Fixed to patch properly.
diffstat:
4 files changed, 51 insertions(+), 60 deletions(-)
ChangeLog | 6 ++
acinclude.m4 | 2
configure | 4 +
patches/icedtea-always-zero.patch | 99 ++++++++++++++-----------------------
diffs (218 lines):
diff -r 9f09fe26b5b9 -r 7265512f3f6f ChangeLog
--- a/ChangeLog Sun Feb 17 22:09:02 2008 +0100
+++ b/ChangeLog Sun Feb 17 16:39:29 2008 -0500
@@ -5,6 +5,12 @@ 2008-02-17 Mark Wielaard <mark at klomp.o
(patch-ecj.stamp): Fail when patch doesn't apply.
(clean-patch-ecj): Fail when patch doesn't revert.
* Makefile.in: Regenerated.
+
+2008-02-15 Lillian Angel <langel at redhat.com>
+
+ * acinclude.m4: Added configure msg.
+ * configure: Regenerated.
+ * patches/icedtea-always-zero.patch: Fixed to patch properly.
2008-02-15 Lillian Angel <langel at redhat.com>
diff -r 9f09fe26b5b9 -r 7265512f3f6f acinclude.m4
--- a/acinclude.m4 Sun Feb 17 22:09:02 2008 +0100
+++ b/acinclude.m4 Sun Feb 17 16:39:29 2008 -0500
@@ -514,6 +514,8 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
AC_ARG_ENABLE([zero],
[AS_HELP_STRING(--enable-zero,use zero-assembler port on non-zero platforms)],
[
+ AC_MSG_CHECKING(zero-assembler port)
+ AC_MSG_RESULT(will apply patches/icedtea-always-zero.patch)
AM_CONDITIONAL(ZERO_BUILD, test x = x)
],
[
diff -r 9f09fe26b5b9 -r 7265512f3f6f configure
--- a/configure Sun Feb 17 22:09:02 2008 +0100
+++ b/configure Sun Feb 17 16:39:29 2008 -0500
@@ -7107,6 +7107,10 @@ fi
# Check whether --enable-zero was given.
if test "${enable_zero+set}" = set; then
enableval=$enable_zero;
+ { echo "$as_me:$LINENO: checking zero-assembler port" >&5
+echo $ECHO_N "checking zero-assembler port... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: will apply patches/icedtea-always-zero.patch" >&5
+echo "${ECHO_T}will apply patches/icedtea-always-zero.patch" >&6; }
if test x = x; then
ZERO_BUILD_TRUE=
ZERO_BUILD_FALSE='#'
diff -r 9f09fe26b5b9 -r 7265512f3f6f patches/icedtea-always-zero.patch
--- a/patches/icedtea-always-zero.patch Sun Feb 17 22:09:02 2008 +0100
+++ b/patches/icedtea-always-zero.patch Sun Feb 17 16:39:29 2008 -0500
@@ -1,123 +1,103 @@ diff -r b8a03891e55e openjdk/hotspot/mak
-diff -r b8a03891e55e openjdk/hotspot/make/defs.make
---- openjdk/hotspot/make/defs.make Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/hotspot/make/defs.make Thu Feb 14 13:06:37 2008 +0000
-@@ -209,6 +209,7 @@ ifneq ($(OSNAME),windows)
- else
- BUILDARCH = i486
+--- defs.make 2008-02-17 16:25:58.000000000 -0500
++++ openjdk/hotspot/make/defs.make 2008-02-17 16:27:04.000000000 -0500
+@@ -213,6 +213,7 @@
+ SRCARCH = amd64
endif
-+ SRCARCH = zero
endif
- ifeq ($(BUILDARCH), sparc)
- ifdef LP64
-diff -r b8a03891e55e openjdk/hotspot/build/linux/platform_amd64
---- openjdk/hotspot/build/linux/platform_amd64 Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/hotspot/build/linux/platform_amd64 Thu Feb 14 12:57:36 2008 +0000
-@@ -1,12 +1,12 @@ os_family = linux
++SCARCH = zero
+
+ # BUILDARCH is usually the same as SRCARCH, except for sparcv9 and zero
+ BUILDARCH = $(SRCARCH)
+--- oldopenjdk6/hotspot/build/linux/platform_amd64 2008-02-12 04:14:13.000000000 -0500
++++ openjdk/hotspot/build/linux/platform_amd64 2008-02-17 16:28:12.000000000 -0500
+@@ -1,8 +1,8 @@
os_family = linux
--arch = x86
+-arch = amd64
+arch = zero
--arch_model = x86_64
-+arch_model = zero
-
--os_arch = linux_x86
+-os_arch = linux_amd64
+os_arch = linux_zero
-
--os_arch_model = linux_x86_64
-+os_arch_model = linux_zero
lib_arch = amd64
-@@ -14,4 +14,4 @@ compiler = gcc
+@@ -10,4 +10,4 @@
gnu_dis_arch = amd64
-sysdefs = -DLINUX -D_GNU_SOURCE -DAMD64
+sysdefs = -DLINUX -D_GNU_SOURCE -DAMD64 -DCC_INTERP -DZERO
-diff -r b8a03891e55e openjdk/hotspot/build/linux/platform_i486
---- openjdk/hotspot/build/linux/platform_i486 Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/hotspot/build/linux/platform_i486 Thu Feb 14 12:57:36 2008 +0000
-@@ -1,12 +1,12 @@ os_family = linux
+--- oldopenjdk6/hotspot/build/linux/platform_i486 2008-02-12 04:14:13.000000000 -0500
++++ openjdk/hotspot/build/linux/platform_i486 2008-02-17 16:29:59.000000000 -0500
+@@ -1,8 +1,8 @@
os_family = linux
--arch = x86
+-arch = i486
+arch = zero
--arch_model = x86_32
-+arch_model = zero
-
--os_arch = linux_x86
+-os_arch = linux_i486
+os_arch = linux_zero
-
--os_arch_model = linux_x86_32
-+os_arch_model = linux_zero
lib_arch = i386
-@@ -14,4 +14,4 @@ compiler = gcc
+@@ -10,4 +10,4 @@
gnu_dis_arch = i386
-sysdefs = -DLINUX -D_GNU_SOURCE -DIA32
+sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 -DCC_INTERP -DZERO
-diff -r b8a03891e55e openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk/hotspot/build/linux/makefiles/defs.make Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make Thu Feb 14 12:58:03 2008 +0000
-@@ -68,12 +68,12 @@ ifeq ($(ARCH), x86_64)
+--- defs.make 2008-02-17 16:30:44.000000000 -0500
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-02-17 16:31:36.000000000 -0500
+@@ -68,12 +68,12 @@
MAKE_ARGS += LP64=1
PLATFORM = linux-amd64
VM_PLATFORM = linux_amd64
-- HS_ARCH = x86
+- HS_ARCH = amd64
+ HS_ARCH = zero
else
ARCH_DATA_MODEL = 32
PLATFORM = linux-i586
VM_PLATFORM = linux_i486
-- HS_ARCH = x86
+- HS_ARCH = i486
+ HS_ARCH = zero
# We have to reset ARCH to i686 since SRCARCH relies on it
ARCH = i686
endif
-@@ -84,7 +84,7 @@ ifeq ($(ARCH), i686)
+@@ -84,7 +84,7 @@
ARCH_DATA_MODEL = 32
PLATFORM = linux-i586
VM_PLATFORM = linux_i486
-- HS_ARCH = x86
+- HS_ARCH = i486
+ HS_ARCH = zero
endif
# ppc
-diff -r b8a03891e55e openjdk/hotspot/build/linux/makefiles/amd64.make
---- openjdk/hotspot/build/linux/makefiles/amd64.make Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/hotspot/build/linux/makefiles/amd64.make Thu Feb 14 12:57:36 2008 +0000
+--- amd64.make 2008-02-17 16:32:11.000000000 -0500
++++ openjdk/hotspot/build/linux/makefiles/amd64.make 2008-02-17 16:32:16.000000000 -0500
@@ -22,9 +22,6 @@
#
#
-# Not included in includeDB because it has no dependencies
--Obj_Files += linux_x86_64.o
+-Obj_Files += linux_amd64.o
-
# 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 -r b8a03891e55e openjdk/hotspot/build/linux/makefiles/i486.make
---- openjdk/hotspot/build/linux/makefiles/i486.make Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/hotspot/build/linux/makefiles/i486.make Thu Feb 14 12:57:36 2008 +0000
-@@ -22,10 +22,6 @@
+--- i486.make 2008-02-17 16:32:53.000000000 -0500
++++ openjdk/hotspot/build/linux/makefiles/i486.make 2008-02-17 16:32:58.000000000 -0500
+@@ -22,9 +22,6 @@
#
#
-# TLS helper, assembled from .s file
-# Not included in includeDB because it has no dependencies
--Obj_Files += linux_x86_32.o
--
+-Obj_Files += linux_i486.o
+
# 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 -r b8a03891e55e openjdk/jdk/src/solaris/bin/amd64/jvm.cfg
---- openjdk/jdk/src/solaris/bin/amd64/jvm.cfg Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/jdk/src/solaris/bin/amd64/jvm.cfg Thu Feb 14 13:07:27 2008 +0000
+--- jvm.cfg 2008-02-17 16:34:15.000000000 -0500
++++ openjdk/jdk/src/solaris/bin/amd64/jvm.cfg 2008-02-17 16:34:47.000000000 -0500
@@ -31,8 +31,9 @@
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
# and may not be available in a future release.
@@ -129,9 +109,8 @@ diff -r b8a03891e55e openjdk/jdk/src/sol
-hotspot ERROR
-classic WARN
-native ERROR
-diff -r b8a03891e55e openjdk/jdk/src/solaris/bin/i586/jvm.cfg
---- openjdk/jdk/src/solaris/bin/i586/jvm.cfg Thu Feb 14 12:46:26 2008 +0000
-+++ openjdk/jdk/src/solaris/bin/i586/jvm.cfg Thu Feb 14 13:07:27 2008 +0000
+--- oldopenjdk6/jdk/src/solaris/bin/i586/jvm.cfg 2008-02-12 04:08:27.000000000 -0500
++++ openjdk/jdk/src/solaris/bin/i586/jvm.cfg 2008-02-17 16:35:54.000000000 -0500
@@ -30,9 +30,10 @@
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
# and may not be available in a future release.
More information about the distro-pkg-dev
mailing list