/hg/icedtea6: 2009-12-08 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset 711eb8ce4884 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=711eb8ce4884
author: Gary Benson <gbenson at redhat.com>
date: Tue Dec 08 10:52:33 2009 +0000

	2009-12-08 Gary Benson <gbenson at redhat.com>

	 * patches/zero/6903453.patch: New file.
		* patches/icedtea-ia64-fdlibm.patch: Removed.
		* patches/icedtea-uname.patch: Fixed up.
		* Makefile.am (ICEDTEA_PATCHES): Updated.


diffstat:

5 files changed, 46 insertions(+), 33 deletions(-)
ChangeLog                         |    7 ++++++
Makefile.am                       |    2 -
patches/icedtea-ia64-fdlibm.patch |   12 -----------
patches/icedtea-uname.patch       |   20 -------------------
patches/zero/6903453.patch        |   38 +++++++++++++++++++++++++++++++++++++

diffs (125 lines):

diff -r 5dfa3c51f1e5 -r 711eb8ce4884 ChangeLog
--- a/ChangeLog	Tue Dec 08 10:37:26 2009 +0000
+++ b/ChangeLog	Tue Dec 08 10:52:33 2009 +0000
@@ -1,3 +1,10 @@ 2009-12-08  Gary Benson  <gbenson at redhat
+2009-12-08  Gary Benson  <gbenson at redhat.com>
+
+	* patches/zero/6903453.patch: New file.
+	* patches/icedtea-ia64-fdlibm.patch: Removed.
+	* patches/icedtea-uname.patch: Fixed up.
+	* Makefile.am (ICEDTEA_PATCHES): Updated.
+
 2009-12-08  Gary Benson  <gbenson at redhat.com>
 
 	* patches/zero/6896043.patch: New file.
diff -r 5dfa3c51f1e5 -r 711eb8ce4884 Makefile.am
--- a/Makefile.am	Tue Dec 08 10:37:26 2009 +0000
+++ b/Makefile.am	Tue Dec 08 10:52:33 2009 +0000
@@ -510,6 +510,7 @@ ICEDTEA_PATCHES = \
 	patches/zero/6890308.patch \
 	patches/zero/6891677.patch \
 	patches/zero/6896043.patch \
+	patches/zero/6903453.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
@@ -541,7 +542,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
 	patches/icedtea-uname.patch \
-	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-freetypeversion.patch \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-shark-build.patch \
diff -r 5dfa3c51f1e5 -r 711eb8ce4884 patches/icedtea-ia64-fdlibm.patch
--- a/patches/icedtea-ia64-fdlibm.patch	Tue Dec 08 10:37:26 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -r 8c25a5a32f56 openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
---- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sun Apr 13 16:00:28 2008 +0100
-+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Tue Apr 15 15:30:59 2008 +0100
-@@ -30,7 +30,7 @@
- #ifdef __NEWVALID       /* special setup for Sun test regime */
- #if defined(i386) || defined(i486) || \
-         defined(intel) || defined(x86) || \
--        defined(i86pc) || defined(_M_IA64)
-+        defined(i86pc) || defined(ia64)
- #define _LITTLE_ENDIAN
- #endif
- #endif
diff -r 5dfa3c51f1e5 -r 711eb8ce4884 patches/icedtea-uname.patch
--- a/patches/icedtea-uname.patch	Tue Dec 08 10:37:26 2009 +0000
+++ b/patches/icedtea-uname.patch	Tue Dec 08 10:52:33 2009 +0000
@@ -10,16 +10,6 @@
    archExpr = case "$(mach)" in \
                  i[3-9]86) \
                      echo i586 \
-@@ -204,6 +207,9 @@
-                 sparc*) \
-                     echo sparc \
-                     ;; \
-+                arm*) \
-+                    echo arm \
-+                    ;; \
-                 *) \
-                     echo $(mach) \
-                     ;; \
 --- openjdk/corba/make/common/shared/Platform.gmk.orig	2008-10-27 11:44:47.000000000 +0100
 +++ openjdk/corba/make/common/shared/Platform.gmk	2008-10-27 11:53:01.000000000 +0100
 @@ -181,6 +181,9 @@
@@ -32,13 +22,3 @@
    archExpr = case "$(mach)" in \
                  i[3-9]86) \
                      echo i586 \
-@@ -194,6 +197,9 @@
-                 sparc*) \
-                     echo sparc \
-                     ;; \
-+                arm*) \
-+                    echo arm \
-+                    ;; \
-                 *) \
-                     echo $(mach) \
-                     ;; \
diff -r 5dfa3c51f1e5 -r 711eb8ce4884 patches/zero/6903453.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6903453.patch	Tue Dec 08 10:52:33 2009 +0000
@@ -0,0 +1,38 @@
+diff -r 937144222e22 -r 28b983e5bb5f make/common/shared/Platform.gmk
+--- openjdk/corba/make/common/shared/Platform.gmk	Sun Nov 08 14:49:40 2009 -0800
++++ openjdk/corba/make/common/shared/Platform.gmk	Mon Nov 23 10:04:41 2009 +0000
+@@ -187,6 +187,9 @@
+                 sparc*) \
+                     echo sparc \
+                     ;; \
++                arm*) \
++                    echo arm \
++                    ;; \
+                 *) \
+                     echo $(mach) \
+                     ;; \
+diff -r 8fb602395be0 -r ad1c88142958 make/common/shared/Platform.gmk
+--- openjdk/jdk/make/common/shared/Platform.gmk	Sun Nov 08 14:49:18 2009 -0800
++++ openjdk/jdk/make/common/shared/Platform.gmk	Mon Nov 23 10:04:47 2009 +0000
+@@ -165,6 +165,9 @@
+                 sparc*) \
+                     echo sparc \
+                     ;; \
++                arm*) \
++                    echo arm \
++                    ;; \
+                 *) \
+                     echo $(mach) \
+                     ;; \
+diff -r 8fb602395be0 -r ad1c88142958 src/share/native/java/lang/fdlibm/include/fdlibm.h
+--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sun Nov 08 14:49:18 2009 -0800
++++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Mon Nov 23 10:04:47 2009 +0000
+@@ -29,7 +29,7 @@
+ #ifdef __NEWVALID       /* special setup for Sun test regime */
+ #if defined(i386) || defined(i486) || \
+         defined(intel) || defined(x86) || \
+-        defined(i86pc) || defined(_M_IA64)
++        defined(i86pc) || defined(_M_IA64) || defined(ia64)
+ #define _LITTLE_ENDIAN
+ #endif
+ #endif