[PATCH REVIEW] [1.10] RFC: Support Linux 3

[Andrew John Hughes]

On Fri, Jul 08, 2011 at 04:11:21PM +0100, Andrew John Hughes wrote:
> I'd like to backport the attached patch to 1.10.
> 
> I also intend to backport this to 1.8 & 1.9 if anyone wants to give an early approval.
> 
> ChangeLog:
> 
> 2011-06-28  Andrew John Hughes  <ahughes at redhat.com>
> 
> 	* Makefile.am: Add new patch.
> 	* patches/support_linux_3.patch:
> 	Allow Linux 3* through the HotSpot OS version
> 	filter.
> 	* NEWS: Updated.
> -- 
> Andrew :)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> Support Free Java!
> Contribute to GNU Classpath and IcedTea
> http://www.gnu.org/software/classpath
> http://icedtea.classpath.org
> PGP Key: F5862A37 (https://keys.indymedia.org/)
> Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37

And the patch...
-- 
Andrew :)

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

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37
-------------- next part --------------
# HG changeset patch
# User Andrew John Hughes <ahughes at redhat.com>
# Date 1310072477 -3600
# Node ID 28c6f2df462771fd38f0f98092bbe177c6abfb26
# Parent  a95c47b36218144c9539d74f63320c1b84fe7722
Allow Linux 3* to pass through the HotSpot OS version filter.

2011-06-28  Andrew John Hughes  <ahughes at redhat.com>

	* Makefile.am: Add new patch.
	* patches/support_linux_3.patch:
	Allow Linux 3* through the HotSpot OS version
	filter.
	* NEWS: Updated.

diff -r a95c47b36218 -r 28c6f2df4627 ChangeLog
--- a/ChangeLog	Wed Jun 08 18:16:37 2011 +0100
+++ b/ChangeLog	Thu Jul 07 22:01:17 2011 +0100
@@ -1,3 +1,11 @@
+2011-06-28  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/support_linux_3.patch:
+	Allow Linux 3* through the HotSpot OS version
+	filter.
+	* NEWS: Updated.
+
 2011-06-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add 1.10.3.
diff -r a95c47b36218 -r 28c6f2df4627 Makefile.am
--- a/Makefile.am	Wed Jun 08 18:16:37 2011 +0100
+++ b/Makefile.am	Thu Jul 07 22:01:17 2011 +0100
@@ -341,7 +341,8 @@
 	patches/openjdk/7031385-gcc-register-allocation-fix.patch \
 	patches/shark-llvm-2.9.patch \
 	patches/openjdk/pgram-pipe-regression.patch \
-	patches/openjdk/mutter.patch
+	patches/openjdk/mutter.patch \
+	patches/support_linux_3.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r a95c47b36218 -r 28c6f2df4627 NEWS
--- a/NEWS	Wed Jun 08 18:16:37 2011 +0100
+++ b/NEWS	Thu Jul 07 22:01:17 2011 +0100
@@ -11,6 +11,9 @@
 
 New in release 1.10.3 (20XX-XX-XX):
 
+* Bug fixes
+  - PR748: Icedtea6 fails to build with Linux 3.0.
+
 New in release 1.10.2 (2011-06-07):
 
 * Security fixes
diff -r a95c47b36218 -r 28c6f2df4627 patches/support_linux_3.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/support_linux_3.patch	Thu Jul 07 22:01:17 2011 +0100
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User andrew
+# Date 1309217125 -3600
+# Node ID f7e8b10f51c6a622520b55df0c644fb09ec78542
+# Parent  b8227c320dec384a94026fcaa650b0ebd4eef13b
+Allow building HotSpot with any Linux 3 version.
+
+diff -r b8227c320dec -r f7e8b10f51c6 make/linux/Makefile
+--- openjdk/hotspot/make/linux/Makefile	Wed Jun 15 18:56:52 2011 +0100
++++ openjdk/hotspot/make/linux/Makefile	Tue Jun 28 00:25:25 2011 +0100
+@@ -230,7 +230,7 @@
+ # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+ 
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+