/hg/icedtea6-hg: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 31 17:46:36 UTC 2015
changeset cc9dd4878fae in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cc9dd4878fae
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Mar 26 17:26:21 2015 +0000
Add 1.13.6 release notes.
2015-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS:
Add 1.13.6 release notes.
changeset b80635ef514b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b80635ef514b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Mar 31 15:08:53 2015 +0100
Merge
changeset 8aa8364515bf in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8aa8364515bf
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Mar 31 18:45:41 2015 +0100
Remove upstreamed patches and re-generate arch.patch.
2015-03-31 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch,
* patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch,
* patches/openjdk/oj51-pr2187-sync_4873188.patch,
* patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch,
* patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch,
* patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch:
Removed; upstreamed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* patches/arch.patch: Regenerated following
upstream application of OPENJDK6-53.
diffstat:
ChangeLog | 24 +
Makefile.am | 10 +-
NEWS | 27 +-
patches/arch.patch | 421 ++++---
patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch | 55 -
patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch | 522 ----------
patches/openjdk/oj51-pr2187-sync_4873188.patch | 58 -
patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch | 73 -
patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch | 25 -
patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch | 15 -
10 files changed, 258 insertions(+), 972 deletions(-)
diffs (truncated from 1332 to 500 lines):
diff -r 6f0c7f0ded92 -r 8aa8364515bf ChangeLog
--- a/ChangeLog Thu Jan 22 00:48:41 2015 +0000
+++ b/ChangeLog Tue Mar 31 18:45:41 2015 +0100
@@ -1,3 +1,27 @@
+2015-03-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch,
+ * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch,
+ * patches/openjdk/oj51-pr2187-sync_4873188.patch,
+ * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch,
+ * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch,
+ * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+ * patches/arch.patch: Regenerated following
+ upstream application of OPENJDK6-53.
+
+2015-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS:
+ Add 1.13.6 release notes.
+
+2015-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b35.
+
2015-01-21 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 6f0c7f0ded92 -r 8aa8364515bf Makefile.am
--- a/Makefile.am Thu Jan 22 00:48:41 2015 +0000
+++ b/Makefile.am Tue Mar 31 18:45:41 2015 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 20_jan_2015
OPENJDK_SHA256SUM = 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51
-OPENJDK_VERSION = b34
+OPENJDK_VERSION = b35
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -609,13 +609,7 @@
patches/pr2070-type_punning_warnings.patch \
patches/pr2082-s390_type_fixes.patch \
patches/pr2096-4096-bit_dh.patch \
- patches/pr2179-avoid_x86_workaround_on_zero.patch \
- patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch \
- patches/openjdk/oj51-pr2187-sync_4873188.patch \
- patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch \
- patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch \
- patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch \
- patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch
+ patches/pr2179-avoid_x86_workaround_on_zero.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 6f0c7f0ded92 -r 8aa8364515bf NEWS
--- a/NEWS Thu Jan 22 00:48:41 2015 +0000
+++ b/NEWS Tue Mar 31 18:45:41 2015 +0100
@@ -14,6 +14,20 @@
New in release 1.14.0 (201X-XX-XX):
+* Backports
+ - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
+ - S6727719: Performance of TextLayout.getBounds()
+ - S6745225: Memory leak while drawing Attributed String
+ - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
+ - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+ - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
+ - S8026887: Make issues due to failed large pages allocations easier to debug
+* Bug fixes
+ - PR1886: IcedTea does not checksum supplied tarballs
+ - PR2083: Add support for building Zero on AArch64
+
+New in release 1.13.6 (2015-01-23):
+
* Security fixes
- S8046656: Update protocol support
- S8047125, CVE-2015-0395: (ref) More phantom object references
@@ -168,34 +182,27 @@
- OJ52, PR2185: Application of 6786276 introduces compatibility issue
- OJ53, PR2181: strict-aliasing warnings issued on PPC32
- OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport
- - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
- - S6727719: Performance of TextLayout.getBounds()
- S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address"
- - S6745225: Memory leak while drawing Attributed String
- - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
- S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine
- - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
- S8000897, PR2173, RH1155012: VM crash in CompileBroker
- - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
- S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object
- - S8026887: Make issues due to failed large pages allocations easier to debug
- S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
- S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge
* Bug fixes
- PR1831: Drop version requirement for LCMS 2
- PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
- - PR1886: IcedTea does not checksum supplied tarballs
- PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
- PR2062: Unset OS before running OpenJDK build
- PR2070: Type-punning warnings still evident on RHEL 5
- PR2082: Cast should use same type as GCDrainStackTargetSize (uintx).
- - PR2083: Add support for building Zero on AArch64
- PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
- PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
- PR2179: Avoid x86 workaround when running Zero rather than a JIT
- PR2180: Old autotools dislike $(builddir)/fsg.sh
* CACAO
- - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
+ - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5
+* JamVM
+ - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5
New in release 1.13.5 (2014-10-14):
diff -r 6f0c7f0ded92 -r 8aa8364515bf patches/arch.patch
--- a/patches/arch.patch Thu Jan 22 00:48:41 2015 +0000
+++ b/patches/arch.patch Tue Mar 31 18:45:41 2015 +0100
@@ -1,7 +1,216 @@
---- 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
+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 2010-05-26 09:31:18.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2015-03-31 16:43:11.850271287 +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 2015-03-31 15:23:48.410803372 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk 2015-03-31 16:43:11.850271287 +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 2015-02-05 18:49:58.372812460 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk 2015-03-31 16:45:47.396086418 +0100
+@@ -102,10 +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
+ # 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_ppc += -fsigned-char -D_BIG_ENDIAN
++CFLAGS_REQUIRED_m68k +=
++CFLAGS_REQUIRED_mips +=
++CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN
++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/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2015-03-31 15:23:48.254801559 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2015-03-31 16:51:56.332405289 +0100
+@@ -70,28 +70,56 @@
+ else
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
+- 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
++ ifneq ("$(findstring m68k,$(ARCH))", "")
++ # m68k
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring mips,$(ARCH))", "")
++ # 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
+ # Option used to create a shared library
+ SHARED_LIBRARY_FLAG = -shared
+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 2015-03-31 15:23:48.410803372 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2015-03-31 16:43:11.850271287 +0100
+@@ -222,9 +222,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/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2013-08-21 20:32:57.524222927 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2015-03-31 16:44:39.367291058 +0100
@@ -58,10 +58,54 @@
- ifdef ICEDTEA_ZERO_BUILD
+ ifeq ($(ZERO_BUILD), true)
CPPFLAGS += -DX_ARCH=X_ZERO
else
+ ifeq ($(ARCH), alpha)
@@ -66,143 +275,9 @@
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
-@@ -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
- # 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/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
-@@ -70,28 +70,56 @@
- else
- CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
- endif
-- ifneq ("$(findstring sparc,$(ARCH))", "")
-- # sparc or sparcv9
-- REQUIRED_CC_VER = 4.0
-- REQUIRED_GCC_VER = 4.0.*
-- else
-- ifeq ($(ARCH_DATA_MODEL), 32)
-- # i586
-+ ifeq ($(ARCH), alpha)
-+ # alpha
- REQUIRED_CC_VER = 3.2
-- REQUIRED_GCC_VER = 3.2.1*
-- REQUIRED_GCC_VER_INT = 3.2.1-7a
-- else
-+ 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
-+ endif
- ifeq ($(ARCH), ia64)
- # ia64
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 2.9[56789].*
- endif
-+ ifneq ("$(findstring m68k,$(ARCH))", "")
-+ # m68k
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
- endif
-+ ifneq ("$(findstring mips,$(ARCH))", "")
-+ # 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
- # 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 @@
- 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
---- 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/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 2013-08-21 20:32:57.952229855 +0100
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2015-03-31 16:43:11.850271287 +0100
@@ -33,12 +33,21 @@
#define X_LINUX 3
@@ -231,69 +306,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.
More information about the distro-pkg-dev
mailing list