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

doko at ubuntu.com doko at ubuntu.com
Wed Dec 10 15:35:59 PST 2008 

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

	        * patches/hotspot/*/icedtea-text-relocations.patch: Update for PARISC.
	        * patches/icedtea-zero.patch: Likewise.
	        * patches/hotspot/*/icedtea-parisc-opt.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-parisc-opt.patch.

diffstat:

6 files changed, 67 insertions(+), 3 deletions(-)
ChangeLog                                               |    7 +++
Makefile.am                                             |    3 +
patches/hotspot/14.0b08/icedtea-parisc-opt.patch        |   28 +++++++++++++++
patches/hotspot/14.0b08/icedtea-text-relocations.patch  |    2 -
patches/hotspot/original/icedtea-parisc-opt.patch       |   28 +++++++++++++++
patches/hotspot/original/icedtea-text-relocations.patch |    2 -

diffs (115 lines):

diff -r 96607b3b6ec8 -r 88c957e14fdd ChangeLog
--- a/ChangeLog	Wed Dec 10 16:02:21 2008 -0500
+++ b/ChangeLog	Thu Dec 11 00:35:05 2008 +0100
@@ -1,3 +1,10 @@ 2008-12-10  Deepak Bhole <dbhole at redhat.
+2008-12-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/hotspot/*/icedtea-text-relocations.patch: Update for PARISC.
+	* patches/icedtea-zero.patch: Likewise.
+	* patches/hotspot/*/icedtea-parisc-opt.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Apply icedtea-parisc-opt.patch.
+
 2008-12-10  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Remove spurious
diff -r 96607b3b6ec8 -r 88c957e14fdd Makefile.am
--- a/Makefile.am	Wed Dec 10 16:02:21 2008 -0500
+++ b/Makefile.am	Thu Dec 11 00:35:05 2008 +0100
@@ -509,7 +509,8 @@ ZERO_PATCHES += \
 	patches/icedtea-signature-iterator.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch 
+	patches/icedtea-ia64-bugfix.patch \
+	patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch
 
 if !WITH_ALT_HSBUILD
 ZERO_PATCHES += \
diff -r 96607b3b6ec8 -r 88c957e14fdd patches/hotspot/14.0b08/icedtea-parisc-opt.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/14.0b08/icedtea-parisc-opt.patch	Thu Dec 11 00:35:05 2008 +0100
@@ -0,0 +1,28 @@
+--- openjdk/hotspot/make/linux/makefiles/product.make.orig	2008-12-10 19:02:31.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/product.make	2008-12-10 19:24:53.000000000 +0100
+@@ -25,6 +25,11 @@
+ # Sets make macros for making optimized version of Gamma VM
+ # (This is the "product", not the "release" version.)
+ 
++# work around an ICE in gcc-4.1 and gcc-4.3 on parisc-linux
++ifeq ($(BUILDARCH)-$(ZERO_LIBARCH), zero-parisc)
++  OPT_CFLAGS/codeBlob.o = $(OPT_CFLAGS/NOOPT)
++endif
++
+ # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+ OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+ OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
+--- openjdk/hotspot/make/linux/makefiles/optimized.make.orig	2008-12-10 19:02:22.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/optimized.make	2008-12-10 19:24:24.000000000 +0100
+@@ -25,6 +25,11 @@
+ # Sets make macros for making optimized version of Gamma VM
+ # (This is the "product", not the "release" version.)
+ 
++# work around an ICE in gcc-4.1 and gcc-4.3 on parisc-linux
++ifeq ($(BUILDARCH)-$(ZERO_LIBARCH), zero-parisc)
++  OPT_CFLAGS/codeBlob.o = $(OPT_CFLAGS/NOOPT)
++endif
++
+ # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+ OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+ OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
diff -r 96607b3b6ec8 -r 88c957e14fdd patches/hotspot/14.0b08/icedtea-text-relocations.patch
--- a/patches/hotspot/14.0b08/icedtea-text-relocations.patch	Wed Dec 10 16:02:21 2008 -0500
+++ b/patches/hotspot/14.0b08/icedtea-text-relocations.patch	Thu Dec 11 00:35:05 2008 +0100
@@ -5,7 +5,7 @@ diff -Nru openjdk.orig/hotspot/make/linu
  # Compiler flags
  
  # position-independent code
-+ifneq ($(filter ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),)
++ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),)
  PICFLAG = -fPIC
 +else
 +PICFLAG = -fpic
diff -r 96607b3b6ec8 -r 88c957e14fdd patches/hotspot/original/icedtea-parisc-opt.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/icedtea-parisc-opt.patch	Thu Dec 11 00:35:05 2008 +0100
@@ -0,0 +1,28 @@
+--- openjdk/hotspot/build/linux/makefiles/product.make.orig	2008-12-10 19:02:31.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/product.make	2008-12-10 19:24:53.000000000 +0100
+@@ -25,6 +25,11 @@
+ # Sets make macros for making optimized version of Gamma VM
+ # (This is the "product", not the "release" version.)
+ 
++# work around an ICE in gcc-4.1 and gcc-4.3 on parisc-linux
++ifeq ($(BUILDARCH)-$(ZERO_LIBARCH), zero-parisc)
++  OPT_CFLAGS/codeBlob.o = $(OPT_CFLAGS/NOOPT)
++endif
++
+ # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+ OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+ OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
+--- openjdk/hotspot/build/linux/makefiles/optimized.make.orig	2008-12-10 19:02:22.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/optimized.make	2008-12-10 19:24:24.000000000 +0100
+@@ -25,6 +25,11 @@
+ # Sets make macros for making optimized version of Gamma VM
+ # (This is the "product", not the "release" version.)
+ 
++# work around an ICE in gcc-4.1 and gcc-4.3 on parisc-linux
++ifeq ($(BUILDARCH)-$(ZERO_LIBARCH), zero-parisc)
++  OPT_CFLAGS/codeBlob.o = $(OPT_CFLAGS/NOOPT)
++endif
++
+ # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+ OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+ OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
diff -r 96607b3b6ec8 -r 88c957e14fdd patches/hotspot/original/icedtea-text-relocations.patch
--- a/patches/hotspot/original/icedtea-text-relocations.patch	Wed Dec 10 16:02:21 2008 -0500
+++ b/patches/hotspot/original/icedtea-text-relocations.patch	Thu Dec 11 00:35:05 2008 +0100
@@ -4,7 +4,7 @@
  # Compiler flags
  
  # position-independent code
-+ifneq ($(filter ppc ppc64 s390 s390x sparc sparc64,$(ZERO_LIBARCH)),)
++ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64,$(ZERO_LIBARCH)),)
  PICFLAG = -fPIC
 +else
 +PICFLAG = -fpic

More information about the distro-pkg-dev mailing list