/hg/icedtea6: Fix sanity check for parisc

[doko at icedtea.classpath.org]

changeset 40a336c2526b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=40a336c2526b
author: doko at ubuntu.com
date: Sat Dec 19 13:55:02 2009 +0100

	Fix sanity check for parisc

	2009-12-19 Matthias Klose <doko at ubuntu.com>

	 * patches/icedtea-parisc.patch: Fix sanity check for parisc.
	        * Makefile.am (ICEDTEA_PATCHES): Apply the above.


diffstat:

3 files changed, 21 insertions(+), 1 deletion(-)
ChangeLog                    |    5 +++++
Makefile.am                  |    3 ++-
patches/icedtea-parisc.patch |   14 ++++++++++++++

diffs (43 lines):

diff -r a56c45c73a74 -r 40a336c2526b ChangeLog
--- a/ChangeLog	Thu Dec 17 14:51:20 2009 +0100
+++ b/ChangeLog	Sat Dec 19 13:55:02 2009 +0100
@@ -1,3 +1,8 @@ 2009-12-17  Matthias Klose  <doko at ubuntu
+2009-12-19  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-parisc.patch: Fix sanity check for parisc.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+
 2009-12-17  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/cacao/arm-arch-defines.patch: New, fix cacao build on
diff -r a56c45c73a74 -r 40a336c2526b Makefile.am
--- a/Makefile.am	Thu Dec 17 14:51:20 2009 +0100
+++ b/Makefile.am	Sat Dec 19 13:55:02 2009 +0100
@@ -296,7 +296,8 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6879689-hotspot_warning_fix.patch \
 	patches/icedtea-no-precompiled.patch \
 	patches/icedtea-6897844-xshm.patch \
-	patches/icedtea-linux-separate-debuginfo.patch
+	patches/icedtea-linux-separate-debuginfo.patch \
+	patches/icedtea-parisc.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r a56c45c73a74 -r 40a336c2526b patches/icedtea-parisc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-parisc.patch	Sat Dec 19 13:55:02 2009 +0100
@@ -0,0 +1,14 @@
+--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig	2009-12-19 12:45:34.000000000 +0000
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	2009-12-19 12:45:09.000000000 +0000
+@@ -106,6 +106,11 @@
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 3.2.*
+   endif
++  ifneq ("$(findstring parisc,$(ARCH))", "")
++    # mips
++    REQUIRED_CC_VER = 4.4
++    REQUIRED_GCC_VER = 4.4.*
++  endif
+   ifneq ("$(findstring ppc,$(ARCH))", "")
+     # ppc or ppc64
+     REQUIRED_CC_VER = 3.2