[icedtea6] remove obsolete sparc patch

Dr Andrew John Hughes ahughes at redhat.com
Tue Nov 30 11:40:51 PST 2010


On 18:23 Tue 30 Nov     , Matthias Klose wrote:
> On 30.11.2010 18:21, Dr Andrew John Hughes wrote:
> > On 16:35 Tue 30 Nov     , Matthias Klose wrote:
> >> This chunk can be removed, in the defs.make file it is preceded by
> >>
> >> # sparc
> >> ifneq (,$(filter $(ARCH), sparc sparc64))
> >>     ifeq ($(ARCH_DATA_MODEL), 64)
> >>       ARCH_DATA_MODEL  = 64
> >>       MAKE_ARGS        += LP64=1
> >>       PLATFORM         = linux-sparcv9
> >>       VM_PLATFORM      = linux_sparcv9
> >>     else
> >>       ARCH_DATA_MODEL  = 32
> >>       PLATFORM         = linux-sparc
> >>       VM_PLATFORM      = linux_sparc
> >>     endif
> >>     HS_ARCH            = sparc
> >> endif
> >>
> >>
> >> which already cares about the settings.
> >>
> >>     Matthias
> 
> wrong attachment ...
> 
> 

Ah makes far more sense now! :-)
Looks fine to commit.

> diff -r 7940436316db ChangeLog
> --- a/ChangeLog	Mon Nov 29 15:54:26 2010 +0100
> +++ b/ChangeLog	Tue Nov 30 16:33:43 2010 +0100
> @@ -1,3 +1,7 @@
> +2010-11-30  Matthias Klose  <doko at ubuntu.com>
> +
> +	* patches/icedtea-sparc64-linux.patch: Remove obsolete chunk.
> +
>  2010-11-29  Matthias Klose  <doko at ubuntu.com>
>  
>  	* patches/hotspot/hs19/ia64-fix.patch: Reapply chunk from
> diff -r 7940436316db patches/icedtea-sparc64-linux.patch
> --- a/patches/icedtea-sparc64-linux.patch	Mon Nov 29 15:54:26 2010 +0100
> +++ b/patches/icedtea-sparc64-linux.patch	Tue Nov 30 16:33:43 2010 +0100
> @@ -1,21 +1,3 @@
> -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
> ---- openjdk.orig/hotspot/make/linux/makefiles/defs.make	2008-06-22 22:28:06.000000000 +0100
> -+++ openjdk/hotspot/make/linux/makefiles/defs.make	2008-06-22 22:35:27.000000000 +0100
> -@@ -73,6 +73,14 @@
> -   HS_ARCH            = sparc
> - endif
> - 
> -+# sparc
> -+ifeq ($(ARCH), sparc)
> -+  ARCH_DATA_MODEL  = 32
> -+  PLATFORM         = linux-sparc
> -+  VM_PLATFORM      = linux_sparc
> -+  HS_ARCH          = sparc
> -+endif
> -+
> - # x86_64
> - ifeq ($(ARCH), x86_64) 
> -   ifeq ($(ARCH_DATA_MODEL), 64)
>  diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
>  --- openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-06-22 20:44:41.000000000 +0100
>  +++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-06-22 22:35:27.000000000 +0100


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8



More information about the distro-pkg-dev mailing list