Mercurial > hg > release > icedtea6-1.3

changeset 1000:caf1f4959def

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-08-06 Christian Thalinger <twisti@complang.tuwien.ac.at> * patches/icedtea-cacao.patch: Moved architecture stuff into... * patches/icedtea-arch.patch: New file. * Makefile.am (EXTRA_DIST): Added patches/icedtea-arch.patch. (ICEDTEA_PATCHES): Likewise. * HACKING: Likewise.
author Christian Thalinger <twisti@complang.tuwien.ac.at>
date Wed, 06 Aug 2008 19:13:38 -0400
parents 59665e494100
children fa9a766ac398
files ChangeLog HACKING Makefile.am patches/icedtea-arch.patch patches/icedtea-cacao.patch
diffstat 5 files changed, 289 insertions(+), 235 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 05 17:05:24 2008 +0200
+++ b/ChangeLog	Wed Aug 06 19:13:38 2008 -0400
@@ -1,3 +1,11 @@
+2008-08-06  Christian Thalinger  <twisti@complang.tuwien.ac.at>
+
+	* patches/icedtea-cacao.patch: Moved architecture stuff into...
+	* patches/icedtea-arch.patch: New file.
+	* Makefile.am (EXTRA_DIST): Added patches/icedtea-arch.patch.
+	(ICEDTEA_PATCHES): Likewise.
+	* HACKING: Likewise.
+
 2008-08-05  Christian Thalinger  <twisti@complang.tuwien.ac.at>
 
 	* autogen.sh: New file.
--- a/HACKING	Tue Aug 05 17:05:24 2008 +0200
+++ b/HACKING	Wed Aug 06 19:13:38 2008 -0400
@@ -63,7 +63,7 @@
 * icedtea-hotspot-gcc-pr36917.patch: Work around miscompilation with GCC 4.3 (PR 36917).
 * icedtea-hotspot-citypeflow.patch: Fix hotspot miscompilation with GCC 4.3 on x86.
 * icedtea-alpha-fixes.patch: Fix build issues on alpha-linux.
-* 
+* icedtea-arch.patch: Add support for additional architectures.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
@@ -111,7 +111,7 @@
 
 The following patches are only applied when building with the CACAO virtual machine:
 
-* icedtea-cacao.patch: Add support for additional architectures and don't run 'java' in a new thread.
+* icedtea-cacao.patch: Don't run 'java' in a new thread.
 
 Obsolete Patches
 ================
--- a/Makefile.am	Tue Aug 05 17:05:24 2008 +0200
+++ b/Makefile.am	Wed Aug 06 19:13:38 2008 -0400
@@ -74,7 +74,8 @@
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_FSG_PATCHES) \
 	$(ICEDTEA_ECJ_PATCH) gcjwebplugin.cc tools-copy contrib ports \
 	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
-	patches/icedtea-cacao.patch javaws.png javaws.desktop \
+	patches/icedtea-arch.patch patches/icedtea-cacao.patch \
+	javaws.png javaws.desktop \
 	overlays extra jconsole.desktop policytool.desktop \
 	test/jtreg patches/icedtea-plugin.patch \
 	patches/icedtea-liveconnect.patch IcedTeaPlugin.cc \
@@ -494,7 +495,8 @@
 	patches/icedtea-hotspot-citypeflow.patch \
 	patches/icedtea-alpha-fixes.patch \
 	$(SHARK_PATCH) \
-	$(GCC_PATCH)
+	$(GCC_PATCH) \
+	patches/icedtea-arch.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-arch.patch	Wed Aug 06 19:13:38 2008 -0400
@@ -0,0 +1,275 @@
+diff -r 63b67d07d5e9 openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- ../openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Tue Mar 25 16:27:33 2008 +0000
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Wed Mar 26 08:24:35 2008 +0000
+@@ -75,28 +75,51 @@ ifeq ($(PLATFORM), linux)
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 3.2.*
+   else
+-  ifneq ("$(findstring sparc,$(ARCH))", "")
+-    # sparc or sparcv9
+-    REQUIRED_CC_VER = 4.0
+-    REQUIRED_GCC_VER = 4.0.*
+-  else
+-  ifeq ($(ARCH_DATA_MODEL), 32)
++  ifeq ($(ARCH), alpha)
++    # alpha
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
++  endif
++  ifeq ($(ARCH), amd64)
++    # amd64
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
++  endif
++  ifeq ($(ARCH), arm)
++    # arm
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
++  endif
++  ifeq ($(ARCH), i586)
+     # i586
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 3.2.1*
+     REQUIRED_GCC_VER_INT = 3.2.1-7a
+-  else
+-  ifeq ($(ARCH), amd64)
+-    # amd64
+-    REQUIRED_CC_VER = 3.2
+-    REQUIRED_GCC_VER = 3.2.*
+   endif
+   ifeq ($(ARCH), ia64)
+     # ia64
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 2.9[56789].*
+   endif
++  ifeq ($(ARCH), mips)
++    # mips
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
+   endif
++  ifneq ("$(findstring ppc,$(ARCH))", "")
++    # ppc or ppc64
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
++  endif
++  ifneq ("$(findstring s390,$(ARCH))", "")
++    # s390 or s390x
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
++  endif
++  ifneq ("$(findstring sparc,$(ARCH))", "")
++    # sparc or sparcv9
++    REQUIRED_CC_VER = 4.0
++    REQUIRED_GCC_VER = 4.0.*
+   endif
+   endif
+   # Option used to create a shared library
+diff -r 63b67d07d5e9 openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- ../openjdk/jdk/make/javax/sound/SoundDefs.gmk	Tue Mar 25 16:27:33 2008 +0000
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk	Wed Mar 26 08:29:28 2008 +0000
+@@ -58,9 +58,45 @@ ifdef ICEDTEA_ZERO_BUILD
+ ifdef ICEDTEA_ZERO_BUILD
+   CPPFLAGS += -DX_ARCH=X_ZERO
+ else
++  ifeq ($(ARCH), alpha)
++    CPPFLAGS += -DX_ARCH=X_ALPHA
++  endif # ARCH alpha
++
++  ifeq ($(ARCH), amd64)
++    CPPFLAGS += -DX_ARCH=X_AMD64
++  endif # ARCH amd64
++
++  ifeq ($(ARCH), arm)
++    CPPFLAGS += -DX_ARCH=X_ARM
++  endif # ARCH arm
++
+   ifeq ($(ARCH), i586)
+     CPPFLAGS += -DX_ARCH=X_I586
+   endif # ARCH i586
++
++  ifeq ($(ARCH), ia64)
++    CPPFLAGS += -DX_ARCH=X_IA64
++  endif # ARCH ia64
++
++  ifeq ($(ARCH), mips)
++    CPPFLAGS += -DX_ARCH=X_MIPS
++  endif # ARCH mips
++
++  ifeq ($(ARCH), ppc)
++    CPPFLAGS += -DX_ARCH=X_PPC
++  endif # ARCH ppc
++
++  ifeq ($(ARCH), ppc64)
++    CPPFLAGS += -DX_ARCH=X_PPC64
++  endif # ARCH ppc64
++
++  ifeq ($(ARCH), s390)
++    CPPFLAGS += -DX_ARCH=X_S390
++  endif # ARCH s390
++
++  ifeq ($(ARCH), s390x)
++    CPPFLAGS += -DX_ARCH=X_S390X
++  endif # ARCH s390x
+ 
+   ifeq ($(ARCH), sparc)
+     CPPFLAGS += -DX_ARCH=X_SPARC
+@@ -69,10 +105,6 @@ else
+   ifeq ($(ARCH), sparcv9)
+     CPPFLAGS += -DX_ARCH=X_SPARCV9
+   endif # ARCH sparcv9
+-
+-  ifeq ($(ARCH), amd64)
+-    CPPFLAGS += -DX_ARCH=X_AMD64
+-  endif # ARCH amd64
+ endif
+ 
+ 
+diff -r 63b67d07d5e9 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- ../openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Mar 25 16:27:33 2008 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Mar 26 08:38:14 2008 +0000
+@@ -33,12 +33,19 @@
+ #define X_LINUX         3
+ 
+ // types for X_ARCH
+-#define X_I586          1
+-#define X_SPARC         2
+-#define X_SPARCV9       3
+-#define X_IA64          4
+-#define X_AMD64         5
+-#define X_ZERO          6
++#define X_ALPHA         1
++#define X_AMD64         2
++#define X_ARM           3
++#define X_I586          4
++#define X_IA64          5
++#define X_MIPS          6
++#define X_PPC           7
++#define X_PPC64         8
++#define X_S390          9
++#define X_S390X         10
++#define X_SPARC         11
++#define X_SPARCV9       12
++#define X_ZERO          13
+ 
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+--- openjdk/corba/make/common/shared/Platform.gmk~	2008-04-21 09:54:27.000000000 +0200
++++ openjdk/corba/make/common/shared/Platform.gmk	2008-04-21 16:14:54.000000000 +0200
+@@ -224,9 +224,34 @@
+   else
+     # i586 is 32-bit, amd64 is 64-bit
+     ifndef ARCH_DATA_MODEL
++      ifeq ($(ARCH), alpha)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), amd64)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), arm)
++        ARCH_DATA_MODEL=32
++      endif
+       ifeq ($(ARCH), i586)
+         ARCH_DATA_MODEL=32
+-      else
++      endif
++      ifeq ($(ARCH), ia64)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), mips)
++        ARCH_DATA_MODEL=32
++      endif
++      ifeq ($(ARCH), ppc)
++        ARCH_DATA_MODEL=32
++      endif
++      ifeq ($(ARCH), ppc64)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), s390)
++        ARCH_DATA_MODEL=32
++      endif
++      ifeq ($(ARCH), s390x)
+         ARCH_DATA_MODEL=64
+       endif
+     endif
+--- openjdk/jdk/make/common/shared/Platform.gmk~	2008-04-21 09:54:27.000000000 +0200
++++ openjdk/jdk/make/common/shared/Platform.gmk	2008-04-21 16:15:00.000000000 +0200
+@@ -235,9 +235,34 @@
+   else
+     # i586 is 32-bit, amd64 is 64-bit
+     ifndef ARCH_DATA_MODEL
++      ifeq ($(ARCH), alpha)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), amd64)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), arm)
++        ARCH_DATA_MODEL=32
++      endif
+       ifeq ($(ARCH), i586)
+         ARCH_DATA_MODEL=32
+-      else
++      endif
++      ifeq ($(ARCH), ia64)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), mips)
++        ARCH_DATA_MODEL=32
++      endif
++      ifeq ($(ARCH), ppc)
++        ARCH_DATA_MODEL=32
++      endif
++      ifeq ($(ARCH), ppc64)
++        ARCH_DATA_MODEL=64
++      endif
++      ifeq ($(ARCH), s390)
++        ARCH_DATA_MODEL=32
++      endif
++      ifeq ($(ARCH), s390x)
+         ARCH_DATA_MODEL=64
+       endif
+     endif
+diff -r f07251088084 make/common/Defs-linux.gmk
+--- a/corba/make/common/Defs-linux.gmk	Mon Aug 04 13:44:45 2008 -0700
++++ openjdk/corba/make/common/Defs-linux.gmk	Wed Aug 06 18:58:18 2008 -0400
+@@ -92,9 +92,18 @@
+ #    We need this frame pointer to make it easy to walk the stacks.
+ #    This should be the default on X86, but ia64 and amd64 may not have this
+ #    as the default.
++CFLAGS_REQUIRED_alpha   += -mieee -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_arm     += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_hppa    +=
+ CFLAGS_REQUIRED_i586    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_m68k    +=
++CFLAGS_REQUIRED_mips    +=
++CFLAGS_REQUIRED_ppc     += -m32
++CFLAGS_REQUIRED_ppc64   += -m64
++CFLAGS_REQUIRED_s390    +=
++CFLAGS_REQUIRED_s390x   += -m64
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
+diff -r 12a0d0a1bb65 make/common/Defs-linux.gmk
+--- a/jdk/make/common/Defs-linux.gmk	Mon Aug 04 13:45:00 2008 -0700
++++ openjdk/jdk/make/common/Defs-linux.gmk	Wed Aug 06 18:58:22 2008 -0400
+@@ -102,9 +102,18 @@
+ #    We need this frame pointer to make it easy to walk the stacks.
+ #    This should be the default on X86, but ia64 and amd64 may not have this
+ #    as the default.
++CFLAGS_REQUIRED_alpha   += -mieee -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_arm     += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_hppa    +=
+ CFLAGS_REQUIRED_i586    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_m68k    +=
++CFLAGS_REQUIRED_mips    +=
++CFLAGS_REQUIRED_ppc     += -m32
++CFLAGS_REQUIRED_ppc64   += -m64
++CFLAGS_REQUIRED_s390    +=
++CFLAGS_REQUIRED_s390x   += -m64
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
--- a/patches/icedtea-cacao.patch	Tue Aug 05 17:05:24 2008 +0200
+++ b/patches/icedtea-cacao.patch	Wed Aug 06 19:13:38 2008 -0400
@@ -10,237 +10,6 @@
      }
  }
  
-diff -r 63b67d07d5e9 openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- ../openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Tue Mar 25 16:27:33 2008 +0000
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Wed Mar 26 08:24:35 2008 +0000
-@@ -75,28 +75,51 @@ ifeq ($(PLATFORM), linux)
-     REQUIRED_CC_VER = 3.2
-     REQUIRED_GCC_VER = 3.2.*
-   else
--  ifneq ("$(findstring sparc,$(ARCH))", "")
--    # sparc or sparcv9
--    REQUIRED_CC_VER = 4.0
--    REQUIRED_GCC_VER = 4.0.*
--  else
--  ifeq ($(ARCH_DATA_MODEL), 32)
-+  ifeq ($(ARCH), alpha)
-+    # alpha
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-+  endif
-+  ifeq ($(ARCH), amd64)
-+    # amd64
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-+  endif
-+  ifeq ($(ARCH), arm)
-+    # arm
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-+  endif
-+  ifeq ($(ARCH), i586)
-     # i586
-     REQUIRED_CC_VER = 3.2
-     REQUIRED_GCC_VER = 3.2.1*
-     REQUIRED_GCC_VER_INT = 3.2.1-7a
--  else
--  ifeq ($(ARCH), amd64)
--    # amd64
--    REQUIRED_CC_VER = 3.2
--    REQUIRED_GCC_VER = 3.2.*
-   endif
-   ifeq ($(ARCH), ia64)
-     # ia64
-     REQUIRED_CC_VER = 3.2
-     REQUIRED_GCC_VER = 2.9[56789].*
-   endif
-+  ifeq ($(ARCH), mips)
-+    # mips
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-   endif
-+  ifneq ("$(findstring ppc,$(ARCH))", "")
-+    # ppc or ppc64
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-+  endif
-+  ifneq ("$(findstring s390,$(ARCH))", "")
-+    # s390 or s390x
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-+  endif
-+  ifneq ("$(findstring sparc,$(ARCH))", "")
-+    # sparc or sparcv9
-+    REQUIRED_CC_VER = 4.0
-+    REQUIRED_GCC_VER = 4.0.*
-   endif
-   endif
-   # Option used to create a shared library
-diff -r 63b67d07d5e9 openjdk/jdk/make/javax/sound/SoundDefs.gmk
---- ../openjdk/jdk/make/javax/sound/SoundDefs.gmk	Tue Mar 25 16:27:33 2008 +0000
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk	Wed Mar 26 08:29:28 2008 +0000
-@@ -58,9 +58,45 @@ ifdef ICEDTEA_ZERO_BUILD
- ifdef ICEDTEA_ZERO_BUILD
-   CPPFLAGS += -DX_ARCH=X_ZERO
- else
-+  ifeq ($(ARCH), alpha)
-+    CPPFLAGS += -DX_ARCH=X_ALPHA
-+  endif # ARCH alpha
-+
-+  ifeq ($(ARCH), amd64)
-+    CPPFLAGS += -DX_ARCH=X_AMD64
-+  endif # ARCH amd64
-+
-+  ifeq ($(ARCH), arm)
-+    CPPFLAGS += -DX_ARCH=X_ARM
-+  endif # ARCH arm
-+
-   ifeq ($(ARCH), i586)
-     CPPFLAGS += -DX_ARCH=X_I586
-   endif # ARCH i586
-+
-+  ifeq ($(ARCH), ia64)
-+    CPPFLAGS += -DX_ARCH=X_IA64
-+  endif # ARCH ia64
-+
-+  ifeq ($(ARCH), mips)
-+    CPPFLAGS += -DX_ARCH=X_MIPS
-+  endif # ARCH mips
-+
-+  ifeq ($(ARCH), ppc)
-+    CPPFLAGS += -DX_ARCH=X_PPC
-+  endif # ARCH ppc
-+
-+  ifeq ($(ARCH), ppc64)
-+    CPPFLAGS += -DX_ARCH=X_PPC64
-+  endif # ARCH ppc64
-+
-+  ifeq ($(ARCH), s390)
-+    CPPFLAGS += -DX_ARCH=X_S390
-+  endif # ARCH s390
-+
-+  ifeq ($(ARCH), s390x)
-+    CPPFLAGS += -DX_ARCH=X_S390X
-+  endif # ARCH s390x
- 
-   ifeq ($(ARCH), sparc)
-     CPPFLAGS += -DX_ARCH=X_SPARC
-@@ -69,10 +105,6 @@ else
-   ifeq ($(ARCH), sparcv9)
-     CPPFLAGS += -DX_ARCH=X_SPARCV9
-   endif # ARCH sparcv9
--
--  ifeq ($(ARCH), amd64)
--    CPPFLAGS += -DX_ARCH=X_AMD64
--  endif # ARCH amd64
- endif
- 
- 
-diff -r 63b67d07d5e9 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- ../openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Mar 25 16:27:33 2008 +0000
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Mar 26 08:38:14 2008 +0000
-@@ -33,12 +33,19 @@
- #define X_LINUX         3
- 
- // types for X_ARCH
--#define X_I586          1
--#define X_SPARC         2
--#define X_SPARCV9       3
--#define X_IA64          4
--#define X_AMD64         5
--#define X_ZERO          6
-+#define X_ALPHA         1
-+#define X_AMD64         2
-+#define X_ARM           3
-+#define X_I586          4
-+#define X_IA64          5
-+#define X_MIPS          6
-+#define X_PPC           7
-+#define X_PPC64         8
-+#define X_S390          9
-+#define X_S390X         10
-+#define X_SPARC         11
-+#define X_SPARCV9       12
-+#define X_ZERO          13
- 
- // **********************************
- // Make sure you set X_PLATFORM and X_ARCH defines correctly.
---- openjdk/corba/make/common/shared/Platform.gmk~	2008-04-21 09:54:27.000000000 +0200
-+++ openjdk/corba/make/common/shared/Platform.gmk	2008-04-21 16:14:54.000000000 +0200
-@@ -224,9 +224,34 @@
-   else
-     # i586 is 32-bit, amd64 is 64-bit
-     ifndef ARCH_DATA_MODEL
-+      ifeq ($(ARCH), alpha)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), amd64)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), arm)
-+        ARCH_DATA_MODEL=32
-+      endif
-       ifeq ($(ARCH), i586)
-         ARCH_DATA_MODEL=32
--      else
-+      endif
-+      ifeq ($(ARCH), ia64)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), mips)
-+        ARCH_DATA_MODEL=32
-+      endif
-+      ifeq ($(ARCH), ppc)
-+        ARCH_DATA_MODEL=32
-+      endif
-+      ifeq ($(ARCH), ppc64)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), s390)
-+        ARCH_DATA_MODEL=32
-+      endif
-+      ifeq ($(ARCH), s390x)
-         ARCH_DATA_MODEL=64
-       endif
-     endif
---- openjdk/jdk/make/common/shared/Platform.gmk~	2008-04-21 09:54:27.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Platform.gmk	2008-04-21 16:15:00.000000000 +0200
-@@ -235,9 +235,34 @@
-   else
-     # i586 is 32-bit, amd64 is 64-bit
-     ifndef ARCH_DATA_MODEL
-+      ifeq ($(ARCH), alpha)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), amd64)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), arm)
-+        ARCH_DATA_MODEL=32
-+      endif
-       ifeq ($(ARCH), i586)
-         ARCH_DATA_MODEL=32
--      else
-+      endif
-+      ifeq ($(ARCH), ia64)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), mips)
-+        ARCH_DATA_MODEL=32
-+      endif
-+      ifeq ($(ARCH), ppc)
-+        ARCH_DATA_MODEL=32
-+      endif
-+      ifeq ($(ARCH), ppc64)
-+        ARCH_DATA_MODEL=64
-+      endif
-+      ifeq ($(ARCH), s390)
-+        ARCH_DATA_MODEL=32
-+      endif
-+      ifeq ($(ARCH), s390x)
-         ARCH_DATA_MODEL=64
-       endif
-     endif
 --- openjdk/jdk/make/docs/Makefile~	2008-05-30 09:50:36.000000000 +0200
 +++ openjdk/jdk/make/docs/Makefile	2008-07-02 14:26:54.306671792 +0200
 @@ -58,7 +58,7 @@