changeset in /hg/icedtea6: 2008-12-04 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 644b7ff854fc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=644b7ff854fc
description:
	2008-12-04  Matthias Klose  <doko at ubuntu.com>

	        * patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch: Readd
	        lost chunks from icedtea-sparc.patch, fix build failure with gcc-4.3.
	        * Makefile.am (ICEDTEA_PATCHES): Apply new patch.

diffstat:

3 files changed, 43 insertions(+), 1 deletion(-)
ChangeLog                                              |    6 ++
Makefile.am                                            |    3 -
patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch |   35 ++++++++++++++++

diffs (65 lines):

diff -r 8634e13d4a4a -r 644b7ff854fc ChangeLog
--- a/ChangeLog	Thu Dec 04 17:49:29 2008 +0000
+++ b/ChangeLog	Thu Dec 04 21:38:54 2008 +0100
@@ -1,3 +1,9 @@ 2008-12-04  Andrew John Hughes  <gnu_and
+2008-12-04  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch: Readd
+	lost chunks from icedtea-sparc.patch, fix build failure with gcc-4.3.
+	* Makefile.am (ICEDTEA_PATCHES): Apply new patch.
+
 2008-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 8634e13d4a4a -r 644b7ff854fc Makefile.am
--- a/Makefile.am	Thu Dec 04 17:49:29 2008 +0000
+++ b/Makefile.am	Thu Dec 04 21:38:54 2008 +0100
@@ -583,7 +583,8 @@ if WITH_ALT_HSBUILD
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/icedtea-format-warnings.patch \
-	patches/icedtea-fortify-source.patch
+	patches/icedtea-fortify-source.patch \
+	patches/hotspot/$(HSBUILD)/icedtea-sparc-buildfixes.patch
 endif
 
 if !WITH_ALT_HSBUILD
diff -r 8634e13d4a4a -r 644b7ff854fc patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch	Thu Dec 04 21:38:54 2008 +0100
@@ -0,0 +1,35 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make.orig	2008-12-04 20:29:08.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2008-12-04 20:32:54.000000000 +0000
+@@ -52,6 +52,10 @@
+ PICFLAG = -fpic
+ endif
+ 
++ifneq ($(filter sparc sparcv9,$(BUILDARCH)),)
++PICFLAG = -fPIC
++endif
++
+ VM_PICFLAG/LIBJVM = $(PICFLAG)
+ VM_PICFLAG/AOUT   =
+ VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
+--- openjdk/hotspot/make/linux/makefiles/defs.make.orig	2008-12-04 20:29:04.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/defs.make	2008-12-04 20:32:54.000000000 +0000
+@@ -59,7 +59,7 @@
+ endif
+ 
+ # sparc
+-ifeq ($(ARCH), sparc64)
++ifneq (,$(filter $(ARCH), sparc sparc64))
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+--- openjdk/hotspot/src/cpu/sparc/vm/frame_sparc.hpp.orig	2008-12-04 20:32:19.000000000 +0000
++++ openjdk/hotspot/src/cpu/sparc/vm/frame_sparc.hpp	2008-12-04 20:32:54.000000000 +0000
+@@ -264,7 +264,7 @@
+ 
+  private:
+ 
+-  constantPoolCacheOop* frame::interpreter_frame_cpoolcache_addr() const;
++  constantPoolCacheOop* interpreter_frame_cpoolcache_addr() const;
+ 
+ #ifndef CC_INTERP
+