/hg/release/icedtea6-1.10: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 12 15:41:00 PDT 2012
changeset 96394d394527 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=96394d394527
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 08 14:23:28 2012 +0100
Add security patches for 2012/06/12.
2012-06-07 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add security patches. Make more
patches HotSpot-build specific.
* patches/ecj/override.patch:
Add additional cases from 7143872.
* patches/arm.patch: Moved to HotSpot-specific versions.
* patches/arch.patch,
* patches/freetypeversion.patch,
* patches/gcc-suffix.patch:
Fix to work with no fuzz.
* patches/hotspot/hs20/arm.patch,
* patches/hotspot/hs20/gcc-stack-markings.patch,
* patches/hotspot/hs20/numa_on_early_glibc.patch,
* patches/hotspot/hs20/sparc-trapsfix.patch,
* patches/hotspot/hs20/version-hotspot.patch:
Split to work with hs20 with no fuzz.
* patches/hotspot/original/arm.patch,
* patches/hotspot/original/gcc-stack-markings.patch,
* patches/hotspot/original/numa_on_early_glibc.patch,
* patches/hotspot/original/sparc-trapsfix.patch,
* patches/hotspot/original/version-hotspot.patch:
Likewise for hs19 (original).
* patches/jaxp-serial-version-uid.patch,
* patches/libraries.patch,
* patches/nio2.patch,
* patches/no-static-linking.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6766342-AA-simple-shape-performance.patch,
* patches/openjdk/6797139-jbutton_truncation.patch,
* patches/openjdk/6851973-kerberos.patch,
* patches/openjdk/7102369-7094468-rmiregistry.patch:
Fixed to work with no fuzz.
* patches/openjdk/hs20/7034464-hugepage.patch,
* patches/openjdk/hs20/7103224-glibc_name_collision.patch,
Fixed to work with hs20 and no fuzz.
* patches/openjdk/mutter.patch:
Fixed to work with no fuzz.
* patches/openjdk/original/7034464-hugepage.patch,
* patches/openjdk/original/7103224-glibc_name_collision.patch,
Fixed to work with hs19 (original) and no fuzz.
* patches/openjdk/remove-mimpure-option-to-gcc.patch:
Fixed to work with no fuzz.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7143606.patch,
* patches/security/20120612/7143614.patch,
* patches/security/20120612/7143617.patch,
* patches/security/20120612/7143851.patch,
* patches/security/20120612/7143872.patch,
* patches/security/20120612/7145239.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch,
* patches/security/20120612/hs20/7110720.patch,
* patches/security/20120612/hs20/7152811.patch,
* patches/security/20120612/original/7110720.patch,
* patches/security/20120612/original/7152811.patch,
Security patches for 2012/06/12.
* NEWS: Updated.
changeset 86ca15aa81c3 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=86ca15aa81c3
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 08 14:24:53 2012 +0100
Bump to 1.10.8 proper.
2012-06-08 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Set release date.
* configure.ac: Bump to 1.10.8 proper.
changeset b69d3219265a in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=b69d3219265a
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 11 18:46:05 2012 +0100
Add CVE numbers.
2012-06-11 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add CVE numbers.
changeset eefbd2c9b16a in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=eefbd2c9b16a
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 12 23:36:04 2012 +0100
Added tag icedtea6-1.10.8 for changeset b69d3219265a
diffstat:
.hgtags | 1 +
ChangeLog | 70 +
Makefile.am | 27 +-
NEWS | 17 +-
configure.ac | 2 +-
patches/arch.patch | 293 +-
patches/arm.patch | 166 -
patches/ecj/override.patch | 22 +
patches/freetypeversion.patch | 9 +-
patches/gcc-stack-markings.patch | 14 -
patches/gcc-suffix.patch | 54 +-
patches/hotspot/hs20/arm.patch | 166 +
patches/hotspot/hs20/gcc-stack-markings.patch | 16 +
patches/hotspot/hs20/numa_on_early_glibc.patch | 47 +
patches/hotspot/hs20/sparc-trapsfix.patch | 13 +
patches/hotspot/hs20/version-hotspot.patch | 56 +
patches/hotspot/original/arm.patch | 166 +
patches/hotspot/original/gcc-stack-markings.patch | 16 +
patches/hotspot/original/numa_on_early_glibc.patch | 47 +
patches/hotspot/original/sparc-trapsfix.patch | 13 +
patches/hotspot/original/version-hotspot.patch | 56 +
patches/jaxp-serial-version-uid.patch | 17 +-
patches/libraries.patch | 2589 +++++-----
patches/nio2.patch | 70 +-
patches/no-static-linking.patch | 28 +-
patches/numa_on_early_glibc.patch | 46 -
patches/openjdk/6693253-security_warning.patch | 239 +-
patches/openjdk/6766342-AA-simple-shape-performance.patch | 1106 ++--
patches/openjdk/6797139-jbutton_truncation.patch | 183 +-
patches/openjdk/6851973-kerberos.patch | 38 +-
patches/openjdk/7034464-hugepage.patch | 458 -
patches/openjdk/7102369-7094468-rmiregistry.patch | 57 +-
patches/openjdk/7103224-glibc_name_collision.patch | 236 -
patches/openjdk/hs20/7034464-hugepage.patch | 221 +
patches/openjdk/hs20/7103224-glibc_name_collision.patch | 236 +
patches/openjdk/mutter.patch | 131 +-
patches/openjdk/original/7034464-hugepage.patch | 212 +
patches/openjdk/original/7103224-glibc_name_collision.patch | 227 +
patches/openjdk/remove-mimpure-option-to-gcc.patch | 76 +-
patches/security/20120612/7079902.patch | 508 ++
patches/security/20120612/7143606.patch | 640 ++
patches/security/20120612/7143614.patch | 165 +
patches/security/20120612/7143617.patch | 72 +
patches/security/20120612/7143851.patch | 74 +
patches/security/20120612/7143872.patch | 400 +
patches/security/20120612/7145239.patch | 68 +
patches/security/20120612/7157609.patch | 43 +
patches/security/20120612/7160677.patch | 19 +
patches/security/20120612/7160757.patch | 26 +
patches/security/20120612/hs20/7110720.patch | 129 +
patches/security/20120612/hs20/7152811.patch | 107 +
patches/security/20120612/original/7110720.patch | 120 +
patches/security/20120612/original/7152811.patch | 99 +
patches/sparc-trapsfix.patch | 12 -
patches/version-hotspot.patch | 56 -
55 files changed, 6522 insertions(+), 3457 deletions(-)
diffs (truncated from 11916 to 500 lines):
diff -r d74c9a4312cd -r eefbd2c9b16a .hgtags
--- a/.hgtags Thu May 31 12:40:08 2012 +0200
+++ b/.hgtags Tue Jun 12 23:36:04 2012 +0100
@@ -32,3 +32,4 @@
0000000000000000000000000000000000000000 icedtea6-1.10.6
a49670e226cc5e165da2d63758456f2e265f815f icedtea6-1.10.6
78c05cb3e3c770ebf53babfb4bc825cd059d3b57 icedtea6-1.10.7
+b69d3219265a08e9eea4c47d7acfb32465be6070 icedtea6-1.10.8
diff -r d74c9a4312cd -r eefbd2c9b16a ChangeLog
--- a/ChangeLog Thu May 31 12:40:08 2012 +0200
+++ b/ChangeLog Tue Jun 12 23:36:04 2012 +0100
@@ -1,3 +1,73 @@
+2012-06-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add CVE numbers.
+
+2012-06-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Set release date.
+ * configure.ac: Bump to 1.10.8 proper.
+
+2012-06-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add security patches. Make more
+ patches HotSpot-build specific.
+ * patches/ecj/override.patch:
+ Add additional cases from 7143872.
+ * patches/arm.patch: Moved to HotSpot-specific versions.
+ * patches/arch.patch,
+ * patches/freetypeversion.patch,
+ * patches/gcc-suffix.patch:
+ Fix to work with no fuzz.
+ * patches/hotspot/hs20/arm.patch,
+ * patches/hotspot/hs20/gcc-stack-markings.patch,
+ * patches/hotspot/hs20/numa_on_early_glibc.patch,
+ * patches/hotspot/hs20/sparc-trapsfix.patch,
+ * patches/hotspot/hs20/version-hotspot.patch:
+ Split to work with hs20 with no fuzz.
+ * patches/hotspot/original/arm.patch,
+ * patches/hotspot/original/gcc-stack-markings.patch,
+ * patches/hotspot/original/numa_on_early_glibc.patch,
+ * patches/hotspot/original/sparc-trapsfix.patch,
+ * patches/hotspot/original/version-hotspot.patch:
+ Likewise for hs19 (original).
+ * patches/jaxp-serial-version-uid.patch,
+ * patches/libraries.patch,
+ * patches/nio2.patch,
+ * patches/no-static-linking.patch,
+ * patches/openjdk/6693253-security_warning.patch,
+ * patches/openjdk/6766342-AA-simple-shape-performance.patch,
+ * patches/openjdk/6797139-jbutton_truncation.patch,
+ * patches/openjdk/6851973-kerberos.patch,
+ * patches/openjdk/7102369-7094468-rmiregistry.patch:
+ Fixed to work with no fuzz.
+ * patches/openjdk/hs20/7034464-hugepage.patch,
+ * patches/openjdk/hs20/7103224-glibc_name_collision.patch,
+ Fixed to work with hs20 and no fuzz.
+ * patches/openjdk/mutter.patch:
+ Fixed to work with no fuzz.
+ * patches/openjdk/original/7034464-hugepage.patch,
+ * patches/openjdk/original/7103224-glibc_name_collision.patch,
+ Fixed to work with hs19 (original) and no fuzz.
+ * patches/openjdk/remove-mimpure-option-to-gcc.patch:
+ Fixed to work with no fuzz.
+ * patches/security/20120612/7079902.patch,
+ * patches/security/20120612/7143606.patch,
+ * patches/security/20120612/7143614.patch,
+ * patches/security/20120612/7143617.patch,
+ * patches/security/20120612/7143851.patch,
+ * patches/security/20120612/7143872.patch,
+ * patches/security/20120612/7145239.patch,
+ * patches/security/20120612/7157609.patch,
+ * patches/security/20120612/7160677.patch,
+ * patches/security/20120612/7160757.patch,
+ * patches/security/20120612/hs20/7110720.patch,
+ * patches/security/20120612/hs20/7152811.patch,
+ * patches/security/20120612/original/7110720.patch,
+ * patches/security/20120612/original/7152811.patch,
+ Security patches for 2012/06/12.
+ * NEWS: Updated.
+
2012-05-31 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/coverage-table.patch:
diff -r d74c9a4312cd -r eefbd2c9b16a Makefile.am
--- a/Makefile.am Thu May 31 12:40:08 2012 +0200
+++ b/Makefile.am Tue Jun 12 23:36:04 2012 +0100
@@ -214,7 +214,19 @@
patches/security/20120214/7110700.patch \
patches/security/20120214/7110704.patch \
patches/security/20120214/7118283.patch \
- patches/security/20120214/7126960.patch
+ patches/security/20120214/7126960.patch \
+ patches/security/20120612/7079902.patch \
+ patches/security/20120612/${HSBUILD}/7110720.patch \
+ patches/security/20120612/7143606.patch \
+ patches/security/20120612/7143614.patch \
+ patches/security/20120612/7143617.patch \
+ patches/security/20120612/7143851.patch \
+ patches/security/20120612/7143872.patch \
+ patches/security/20120612/7145239.patch \
+ patches/security/20120612/${HSBUILD}/7152811.patch \
+ patches/security/20120612/7157609.patch \
+ patches/security/20120612/7160677.patch \
+ patches/security/20120612/7160757.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -249,7 +261,7 @@
patches/parisc-opt.patch \
patches/lucene-crash.patch \
patches/version.patch \
- patches/version-hotspot.patch \
+ patches/hotspot/$(HSBUILD)/version-hotspot.patch \
patches/hotspot/$(HSBUILD)/text-relocations.patch \
patches/ssl.patch \
patches/rmi_amd64.patch \
@@ -290,7 +302,7 @@
patches/hotspot/$(HSBUILD)/sparc-buildfixes.patch \
patches/sparc64-linux.patch \
patches/sparc-ptracefix.patch \
- patches/sparc-trapsfix.patch \
+ patches/hotspot/$(HSBUILD)/sparc-trapsfix.patch \
patches/demo-swingapplet.patch \
patches/jtreg-6592792.patch \
patches/s390-noinline.patch \
@@ -302,7 +314,7 @@
patches/java2d-stroker-internal-close-joint.patch \
patches/disable-cc-incompatible-sanity-checks.patch \
patches/explicit-target-arch.patch \
- patches/gcc-stack-markings.patch \
+ patches/hotspot/$(HSBUILD)/gcc-stack-markings.patch \
patches/parisc.patch \
patches/sh4-support.patch \
patches/policy-evaluation.patch \
@@ -310,7 +322,6 @@
patches/libpng.patch \
patches/applet_hole.patch \
patches/jtreg-httpTest.patch \
- patches/arm.patch \
patches/hotspot/$(HSBUILD)/arm.patch \
patches/debug-dir.patch \
patches/no-sync.patch \
@@ -323,7 +334,7 @@
patches/openjdk/6510892-httpserver_test.patch \
patches/openjdk/6638712-wildcard_types.patch \
patches/openjdk/6650759-missing_inference.patch \
- patches/numa_on_early_glibc.patch \
+ patches/hotspot/$(HSBUILD)/numa_on_early_glibc.patch \
patches/jtreg-international-fonts.patch \
patches/openjdk/6967436-6976265-6967434-pisces.patch \
patches/f14-fonts.patch \
@@ -373,7 +384,7 @@
patches/jtreg-bug7036148-test.patch \
patches/support_linux_3.patch \
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
- patches/openjdk/7034464-hugepage.patch \
+ patches/openjdk/$(HSBUILD)/7034464-hugepage.patch \
patches/openjdk/7037939-hugepage.patch \
patches/openjdk/7043564-hugepage.patch \
patches/openjdk/7102369-7094468-rmiregistry.patch \
@@ -382,7 +393,7 @@
patches/openjdk/7091528-javadoc_class_files.patch \
patches/idresolver_fix.patch \
patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \
- patches/openjdk/7103224-glibc_name_collision.patch \
+ patches/openjdk/$(HSBUILD)/7103224-glibc_name_collision.patch \
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
patches/openjdk/remove-mimpure-option-to-gcc.patch \
patches/coverage-table.patch
diff -r d74c9a4312cd -r eefbd2c9b16a NEWS
--- a/NEWS Thu May 31 12:40:08 2012 +0200
+++ b/NEWS Tue Jun 12 23:36:04 2012 +0100
@@ -9,10 +9,23 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.10.8 (2012-XX-XX):
+New in release 1.10.8 (2012-06-12):
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
* Bug fixes
- - PR1018: JVM fails due to SEGV during rendering some Unicode characters
+ - PR1018: JVM fails due to SEGV during rendering some Unicode characters (part of 6886358)
New in release 1.10.7 (2012-05-11):
diff -r d74c9a4312cd -r eefbd2c9b16a configure.ac
--- a/configure.ac Thu May 31 12:40:08 2012 +0200
+++ b/configure.ac Tue Jun 12 23:36:04 2012 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.10.8pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.10.8],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r d74c9a4312cd -r eefbd2c9b16a patches/arch.patch
--- a/patches/arch.patch Thu May 31 12:40:08 2012 +0200
+++ b/patches/arch.patch Tue Jun 12 23:36:04 2012 +0100
@@ -1,73 +1,74 @@
---- openjdk/jdk/make/javax/sound/SoundDefs.gmk.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2008-10-15 17:09:56.000000000 +0200
-@@ -58,10 +58,54 @@
- 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), m68k)
-+ CPPFLAGS += -DX_ARCH=X_M68K
-+ endif # ARCH m68k
-+
-+ ifeq ($(ARCH), mips)
-+ CPPFLAGS += -DX_ARCH=X_MIPS
-+ endif # ARCH mips
-+
-+ ifeq ($(ARCH), mipsel)
-+ CPPFLAGS += -DX_ARCH=X_MIPSEL
-+ endif # ARCH mipsel
-+
-+ 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
- endif # ARCH sparc
-@@ -69,10 +113,6 @@
- ifeq ($(ARCH), sparcv9)
- CPPFLAGS += -DX_ARCH=X_SPARCV9
- endif # ARCH sparcv9
--
-- ifeq ($(ARCH), amd64)
-- CPPFLAGS += -DX_ARCH=X_AMD64
-- endif # ARCH amd64
- endif
-
-
---- openjdk/jdk/make/common/Defs-linux.gmk.orig 2008-10-15 17:04:21.000000000 +0200
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-10-15 17:08:37.000000000 +0200
+diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2011-02-28 16:02:14.000000000 +0000
++++ openjdk/corba/make/common/Defs-linux.gmk 2012-06-08 11:40:58.778526814 +0100
+@@ -92,9 +92,19 @@
+ # 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_mipsel += -D_LITTLE_ENDIAN
++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 -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
+--- openjdk.orig/corba/make/common/shared/Platform.gmk 2012-06-08 11:39:58.213547080 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk 2012-06-08 11:40:58.778526814 +0100
+@@ -220,9 +220,40 @@
+ 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), m68k)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), mips)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), mipsel)
++ 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 -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2011-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk 2012-06-08 11:40:58.770526683 +0100
@@ -102,9 +102,19 @@
# 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
@@ -88,8 +89,9 @@
CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
---- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2008-10-15 17:11:28.000000000 +0200
+diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2012-06-08 11:39:58.053544493 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-06-08 11:40:58.778526814 +0100
@@ -70,28 +70,56 @@
else
CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
@@ -157,9 +159,10 @@
endif
# Option used to create a shared library
SHARED_LIBRARY_FLAG = -shared -mimpure-text
---- openjdk/jdk/make/common/shared/Platform.gmk.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2008-10-15 17:13:49.000000000 +0200
-@@ -237,9 +237,40 @@
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 11:39:58.221547210 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-08 11:40:58.778526814 +0100
+@@ -230,9 +230,40 @@
else
# i586 is 32-bit, amd64 is 64-bit
ifndef ARCH_DATA_MODEL
@@ -201,8 +204,78 @@
ARCH_DATA_MODEL=64
endif
endif
---- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2008-10-15 17:13:01.000000000 +0200
+diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2011-02-28 16:06:11.000000000 +0000
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2012-06-08 11:40:58.770526683 +0100
+@@ -58,10 +58,54 @@
+ ifeq ($(ZERO_BUILD), true)
+ 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), m68k)
++ CPPFLAGS += -DX_ARCH=X_M68K
++ endif # ARCH m68k
++
++ ifeq ($(ARCH), mips)
++ CPPFLAGS += -DX_ARCH=X_MIPS
++ endif # ARCH mips
++
++ ifeq ($(ARCH), mipsel)
++ CPPFLAGS += -DX_ARCH=X_MIPSEL
++ endif # ARCH mipsel
++
++ 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
+ endif # ARCH sparc
+@@ -69,10 +113,6 @@
+ ifeq ($(ARCH), sparcv9)
+ CPPFLAGS += -DX_ARCH=X_SPARCV9
+ endif # ARCH sparcv9
+-
+- ifeq ($(ARCH), amd64)
+- CPPFLAGS += -DX_ARCH=X_AMD64
+- endif # ARCH amd64
+ endif
+
+
+diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-02-28 16:06:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2012-06-08 11:40:58.778526814 +0100
@@ -33,12 +33,21 @@
#define X_LINUX 3
@@ -231,69 +304,3 @@
// **********************************
// Make sure you set X_PLATFORM and X_ARCH defines correctly.
---- openjdk/corba/make/common/Defs-linux.gmk.orig 2008-10-15 17:04:20.000000000 +0200
-+++ openjdk/corba/make/common/Defs-linux.gmk 2008-10-15 17:08:37.000000000 +0200
-@@ -92,9 +92,19 @@
- # 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_mipsel += -D_LITTLE_ENDIAN
-+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
---- openjdk/corba/make/common/shared/Platform.gmk.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/corba/make/common/shared/Platform.gmk 2008-10-15 17:12:19.000000000 +0200
-@@ -227,9 +227,40 @@
- else
- # i586 is 32-bit, amd64 is 64-bit
- ifndef ARCH_DATA_MODEL
-+ ifeq ($(ARCH), alpha)
-+ ARCH_DATA_MODEL=64
-+ endif
-+ ifeq ($(ARCH), amd64)
More information about the distro-pkg-dev
mailing list