/hg/icedtea6-hg: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Apr 9 01:12:36 UTC 2015
changeset 26614f5e1108 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=26614f5e1108
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 01 00:06:27 2015 +0100
PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5
2015-01-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2190: JamVM lacks JVM_FindClassFromCaller introduced
by security patch in 1.13.5
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch when building
JamVM.
(EXTRA_DIST): Include patches from JamVM directory.
* NEWS: Updated.
* patches/jamvm/pr2190-find_class_from_caller.patch:
Backport JamVM patch to implement FindClassFromCaller.
changeset 8abbd8ec5d4c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8abbd8ec5d4c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 03 11:32:46 2015 +0100
Add backports and bug fixes scheduled for 1.13.7.
S6584008, PR2195, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
S7199862, PR2198: Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases
S8074312, PR2255: Enable hotspot builds on Linux 4.x
PR2197: jhat man page has broken URL
PR2201: Support giflib 5.1.0
PR2211: DGifCloseFile call should check the return value, not the error code, for failure
PR2226: giflib 5.1 conditional excludes 6.0, 7.0, etc.
2015-04-03 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch,
* patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch,
* patches/openjdk/8074312-pr2255-support_linux_4.patch,
* patches/pr2197-jhat_man_page_url.patch,
* patches/pr2201-support_giflib_5.1.patch,
* patches/pr2211-check_dgifclosefile_return.patch,
* patches/pr2226-support_future_giflib_6_and_up.patch:
Add new backports and bug fixes.
changeset 28527c40ebd1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=28527c40ebd1
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 01:09:00 2015 +0100
Merge
changeset b7887ba0b847 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b7887ba0b847
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 02:11:45 2015 +0100
Remove upstreamed patches.
2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch,
* patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch,
* patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch:
Removed; upstreamed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
diffstat:
ChangeLog | 54 +
Makefile.am | 23 +-
NEWS | 7 +
patches/arch.patch | 421 ++++---
patches/jamvm/pr2190-find_class_from_caller.patch | 93 +
patches/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch | 30 +
patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch | 55 -
patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch | 522 ----------
patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch | 165 +++
patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch | 80 -
patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch | 106 --
patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch | 36 -
patches/openjdk/8074312-pr2255-support_linux_4.patch | 19 +
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 -
patches/pr2197-jhat_man_page_url.patch | 52 +
patches/pr2201-support_giflib_5.1.patch | 27 +
patches/pr2211-check_dgifclosefile_return.patch | 23 +
patches/pr2226-support_future_giflib_6_and_up.patch | 21 +
21 files changed, 719 insertions(+), 1186 deletions(-)
diffs (truncated from 2052 to 500 lines):
diff -r cc9dd4878fae -r b7887ba0b847 ChangeLog
--- a/ChangeLog Thu Mar 26 17:26:21 2015 +0000
+++ b/ChangeLog Thu Apr 09 02:11:45 2015 +0100
@@ -1,8 +1,62 @@
+2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch,
+ * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch,
+ * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+
+2015-04-03 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated.
+ * patches/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch,
+ * patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch,
+ * patches/openjdk/8074312-pr2255-support_linux_4.patch,
+ * patches/pr2197-jhat_man_page_url.patch,
+ * patches/pr2201-support_giflib_5.1.patch,
+ * patches/pr2211-check_dgifclosefile_return.patch,
+ * patches/pr2226-support_future_giflib_6_and_up.patch:
+ Add new backports and bug fixes.
+
+2015-01-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2190: JamVM lacks JVM_FindClassFromCaller introduced
+ by security patch in 1.13.5
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch when building
+ JamVM.
+ (EXTRA_DIST): Include patches from JamVM directory.
+ * NEWS: Updated.
+ * patches/jamvm/pr2190-find_class_from_caller.patch:
+ Backport JamVM patch to implement FindClassFromCaller.
+
+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 cc9dd4878fae -r b7887ba0b847 Makefile.am
--- a/Makefile.am Thu Mar 26 17:26:21 2015 +0000
+++ b/Makefile.am Thu Apr 09 02:11:45 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
@@ -603,19 +603,17 @@
patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \
patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \
patches/pr2083-aarch64_zero.patch \
- patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \
- patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \
- patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \
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/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch \
+ patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch \
+ patches/openjdk/8074312-pr2255-support_linux_4.patch \
+ patches/pr2197-jhat_man_page_url.patch \
+ patches/pr2201-support_giflib_5.1.patch \
+ patches/pr2211-check_dgifclosefile_return.patch \
+ patches/pr2226-support_future_giflib_6_and_up.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -654,6 +652,11 @@
patches/hotspot/hs23/systemtap-alloc-size-workaround.patch
endif
+if BUILD_JAMVM
+ICEDTEA_PATCHES += \
+ patches/jamvm/pr2190-find_class_from_caller.patch
+endif
+
if ENABLE_NSS
ICEDTEA_PATCHES += patches/rh1022017.patch
NSS_PATCHES = patches/nss-config.patch
diff -r cc9dd4878fae -r b7887ba0b847 NEWS
--- a/NEWS Thu Mar 26 17:26:21 2015 +0000
+++ b/NEWS Thu Apr 09 02:11:45 2015 +0100
@@ -15,16 +15,23 @@
New in release 1.14.0 (201X-XX-XX):
* Backports
+ - S6584008, PR2195, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
- 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
+ - S7199862, PR2198: Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases
- 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
+ - S8074312, PR2255: Enable hotspot builds on Linux 4.x
* Bug fixes
- PR1886: IcedTea does not checksum supplied tarballs
- PR2083: Add support for building Zero on AArch64
+ - PR2197: jhat man page has broken URL
+ - PR2201: Support giflib 5.1.0
+ - PR2211: DGifCloseFile call should check the return value, not the error code, for failure
+ - PR2226: giflib 5.1 conditional excludes 6.0, 7.0, etc.
New in release 1.13.6 (2015-01-23):
diff -r cc9dd4878fae -r b7887ba0b847 patches/arch.patch
--- a/patches/arch.patch Thu Mar 26 17:26:21 2015 +0000
+++ b/patches/arch.patch Thu Apr 09 02:11:45 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)
More information about the distro-pkg-dev
mailing list