/hg/icedtea6-hg: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Apr 15 20:57:31 UTC 2014
changeset 7d844153dc95 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7d844153dc95
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Mar 18 12:32:37 2014 +0000
S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
S8026887: Make issues due to failed large pages allocations easier to debug
2014-03-17 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch,
* patches/openjdk/8013057-detect_mmap_commit_failures.patch,
* patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch:
Backports to improve mmap failure output.
changeset 975cb4907b2e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=975cb4907b2e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Mar 19 17:33:09 2014 +0000
PR1714: Update PaX support to detect running PaX kernel and use newer tools
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1714: Update PaX support to detect running PaX
kernel and use newer tools
* Makefile.am:
(clean-local): Remove clean-icedtea, clean-icedtea-debug
and clean-icedtea-ecj; pulled in by dependents.
(.PHONY): Add clean-runnable-icedtea, clean-runnable-icedtea-debug
and clean-runnable-icedtea-ecj.
(runnable-icedtea): Depend on icedtea and pax-mark-vm.
(clean-runnable-icedtea): Clean stamp.
(icedtea-against-icedtea): Depend on runnable-icedtea rather
than icedtea and pax-mark-vm.
(clean-icedtea-against-icedtea): Depend on clean-runnable-icedtea rather
than clean-pax-mark-vm.
(runnable-icedtea-debug): Depend on icedtea-debug and pax-mark-vm-debug.
(clean-runnable-icedtea-debug): Clean stamp.
(icedtea-debug-against-icedtea): Depend on runnable-icedtea-debug rather
than icedtea-debug and pax-mark-vm-debug.
(clean-icedtea-debug-against-icedtea): Depend on clean-runnable-icedtea-debug
rather than clean-pax-mark-vm.
(add-archive): Depend on runnable-icedtea as the target executes java.
(add-archive-debug): Likewise with runnable-icedtea-debug.
(check-crypto): Depend on runnable-icedtea as the target executes java.
(check-crypto-debug): Likewise with runnable-icedtea-debug.
(runnable-icedtea-ecj): Depend on icedtea-ecj and pax-mark-vm-ecj.
(clean-runnable-icedtea-ecj): Clean stamp.
(icedtea-against-ecj): Depend on runnable-icedtea-ecj rather
than icedtea-ecj and pax-mark-vm-ecj.
(clean-icedtea-against-ecj): Depend on clean-runnable-icedtea-ecj
rather than clean-pax-mark-vm.
(add-archive-ecj): Depend on runnable-icedtea-ecj as the target executes java.
(check-crypto-boot): Depend on runnable-icedtea-ecj as the target executes java.
* NEWS: Updated.
* acinclude.m4:
(IT_HAS_PAX): New macro to detect whether the running
kernel uses PaX.
(IT_WITH_PAX): Rewritten to search for PaX tools -
currently paxmark.sh, paxctl-ng, chpax and paxctl -
and fail if a tool isn't found and a PaX kernel is
being used.
changeset 9ace699eb46a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9ace699eb46a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Mar 20 02:06:20 2014 +0000
PR1712: Allow -Werror to be turned off in the HotSpot build
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1712: Allow -Werror to be turned off in the
HotSpot build
* Makefile.am:
(WERROR_STATUS): Set to true or false
depending on if ENABLE_WERROR is set or not.
(ICEDTEA_ENV): Use WERROR_STATUS to set
COMPILER_WARNINGS_FATAL.
* acinclude.m4:
(IT_ENABLE_WERROR): New macro to enable -Werror.
This is disabled by default.
* configure.ac: Call IT_ENABLE_WERROR.
* javac.in: Handle stripping of arguments which
take parameters, specifically -Xmaxwarns.
* NEWS: Updated.
changeset 0ef5e61b1b00 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0ef5e61b1b00
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Mar 24 16:53:24 2014 -0400
Fixed compilation failure on Aarch64.
changeset 03d11116ab06 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=03d11116ab06
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Mar 25 23:24:47 2014 +0000
Add unreleased upstream patches.
2014-03-25 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(UPSTREAMED_PATCHES): Add patches from unreleased upstream.
(ICEDTEA_PATCHES): Include UPSTREAMED_PATCHES.
* NEWS: Updated.
* patches/openjdk/7110396-sound_code_build_fix.patch,
* patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
* patches/openjdk/oj6-29-jdk_version_info_zeroing.patch:
Add new patches from upstream.
changeset 1c40103f425f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1c40103f425f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 02 16:17:56 2014 +0100
Add 1.13.2 release notes.
2014-04-02 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.13.2 release notes.
changeset 787402b1e556 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=787402b1e556
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 09 22:51:45 2014 +0100
Merge
changeset d755adce0a9b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d755adce0a9b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 10 11:29:11 2014 +0100
Fix to build against 2014/04/15 security patches.
2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/merge_fix.patch,
* patches/openjdk/4685768-focus.patch,
* patches/openjdk/4993545-nativeinlightfixer.patch,
* patches/openjdk/6444769-windowwithwarningtest.patch,
* patches/openjdk/6607170-request_focus.patch,
* patches/openjdk/6607660-treelock.patch,
* patches/openjdk/6616323-component_array.patch,
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/6637796-set_bounds.patch,
* patches/openjdk/6656651-windows_lcd_glyphs.patch,
* patches/openjdk/6682046-shape_calculation.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6725214-direct3d-01.patch,
* patches/openjdk/6748082-isDisplayLocal.patch,
* patches/openjdk/6755274-glgetstring-crash.patch,
* patches/openjdk/6769607-modal-hangs.patch,
* patches/openjdk/6791612-opengl-jni-fix.patch,
* patches/openjdk/6797195-hw_lw_mixing.patch,
* patches/openjdk/6984543-onscreen_rendering_resize_test.patch,
* patches/openjdk/7110396-sound_code_build_fix.patch,
* patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
* patches/openjdk/oj6-29-jdk_version_info_zeroing.patch,
* patches/security/20120214/7112642.patch,
* patches/security/20130618/8009071-improve_shape_handling.patch:
Removed; upstreamed.
* Makefile.am:
(SPECIAL_SECURITY_PATCH_1): Removed.
(SPECIAL_SECURITY_PATCH_2): Likewise.
(LCMS_PATCHES): Add latest security fixes for users of in-tree LCMS2.
(UPSTREAMED_PATCHES): Set to empty.
(ICEDTEA_PATCHES): Remove upstreamed patches.
* patches/nomotif-6706121.patch: Regenerated.
* patches/security/20131015/8014098-better_profile_validation.patch,
* patches/security/20140415/8031335-better_colour_profiling.patch:
Security fixes for LCMS 2, taken from IcedTea 2.4.x.
diffstat:
ChangeLog | 137 +
Makefile.am | 108 +-
NEWS | 15 +
acinclude.m4 | 117 +-
configure.ac | 1 +
contrib/jck/compile-native-code.sh | 3 +
javac.in | 11 +-
patches/linker-libs-order.patch | 44 +-
patches/merge_fix.patch | 280 -
patches/nomotif-6706121.patch | 270 +-
patches/openjdk/4685768-focus.patch | 398 -
patches/openjdk/4993545-nativeinlightfixer.patch | 408 -
patches/openjdk/6444769-windowwithwarningtest.patch | 352 -
patches/openjdk/6607170-request_focus.patch | 709 -
patches/openjdk/6607660-treelock.patch | 112 -
patches/openjdk/6616323-component_array.patch | 1083 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 6197 -
patches/openjdk/6637796-set_bounds.patch | 465 -
patches/openjdk/6656651-windows_lcd_glyphs.patch | 938 -
patches/openjdk/6682046-shape_calculation.patch | 506 -
patches/openjdk/6693253-security_warning.patch | 5391 -
patches/openjdk/6725214-direct3d-01.patch | 62027 ----------
patches/openjdk/6748082-isDisplayLocal.patch | 116 -
patches/openjdk/6755274-glgetstring-crash.patch | 56 -
patches/openjdk/6769607-modal-hangs.patch | 164 -
patches/openjdk/6791612-opengl-jni-fix.patch | 27 -
patches/openjdk/6797195-hw_lw_mixing.patch | 3277 -
patches/openjdk/6984543-onscreen_rendering_resize_test.patch | 30 -
patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch | 29 +
patches/openjdk/8013057-detect_mmap_commit_failures.patch | 867 +
patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch | 81 +
patches/security/20120214/7112642.patch | 750 -
patches/security/20130618/8009071-improve_shape_handling.patch | 1014 -
patches/security/20131015/8014098-better_profile_validation.patch | 59 +
patches/security/20140415/8031335-better_colour_profiling.patch | 4433 +
35 files changed, 5945 insertions(+), 84530 deletions(-)
diffs (truncated from 91583 to 500 lines):
diff -r 963a9ab43d7f -r d755adce0a9b ChangeLog
--- a/ChangeLog Thu Jan 30 21:38:08 2014 +0000
+++ b/ChangeLog Thu Apr 10 11:29:11 2014 +0100
@@ -1,3 +1,140 @@
+2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/merge_fix.patch,
+ * patches/openjdk/4685768-focus.patch,
+ * patches/openjdk/4993545-nativeinlightfixer.patch,
+ * patches/openjdk/6444769-windowwithwarningtest.patch,
+ * patches/openjdk/6607170-request_focus.patch,
+ * patches/openjdk/6607660-treelock.patch,
+ * patches/openjdk/6616323-component_array.patch,
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6637796-set_bounds.patch,
+ * patches/openjdk/6656651-windows_lcd_glyphs.patch,
+ * patches/openjdk/6682046-shape_calculation.patch,
+ * patches/openjdk/6693253-security_warning.patch,
+ * patches/openjdk/6725214-direct3d-01.patch,
+ * patches/openjdk/6748082-isDisplayLocal.patch,
+ * patches/openjdk/6755274-glgetstring-crash.patch,
+ * patches/openjdk/6769607-modal-hangs.patch,
+ * patches/openjdk/6791612-opengl-jni-fix.patch,
+ * patches/openjdk/6797195-hw_lw_mixing.patch,
+ * patches/openjdk/6984543-onscreen_rendering_resize_test.patch,
+ * patches/openjdk/7110396-sound_code_build_fix.patch,
+ * patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
+ * patches/openjdk/oj6-29-jdk_version_info_zeroing.patch,
+ * patches/security/20120214/7112642.patch,
+ * patches/security/20130618/8009071-improve_shape_handling.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (SPECIAL_SECURITY_PATCH_1): Removed.
+ (SPECIAL_SECURITY_PATCH_2): Likewise.
+ (LCMS_PATCHES): Add latest security fixes for users of in-tree LCMS2.
+ (UPSTREAMED_PATCHES): Set to empty.
+ (ICEDTEA_PATCHES): Remove upstreamed patches.
+ * patches/nomotif-6706121.patch: Regenerated.
+ * patches/security/20131015/8014098-better_profile_validation.patch,
+ * patches/security/20140415/8031335-better_colour_profiling.patch:
+ Security fixes for LCMS 2, taken from IcedTea 2.4.x.
+
+2014-04-02 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add 1.13.2 release notes.
+
+2014-03-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (UPSTREAMED_PATCHES): Add patches from unreleased upstream.
+ (ICEDTEA_PATCHES): Include UPSTREAMED_PATCHES.
+ * NEWS: Updated.
+ * patches/openjdk/7110396-sound_code_build_fix.patch,
+ * patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
+ * patches/openjdk/oj6-29-jdk_version_info_zeroing.patch:
+ Add new patches from upstream.
+
+2014-03-24 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * contrib/jck/compile-native-code.sh:
+ Fixed compilation failure on Aarch64.
+
+2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1712: Allow -Werror to be turned off in the
+ HotSpot build
+ * Makefile.am:
+ (WERROR_STATUS): Set to true or false
+ depending on if ENABLE_WERROR is set or not.
+ (ICEDTEA_ENV): Use WERROR_STATUS to set
+ COMPILER_WARNINGS_FATAL.
+ * acinclude.m4:
+ (IT_ENABLE_WERROR): New macro to enable -Werror.
+ This is disabled by default.
+ * configure.ac: Call IT_ENABLE_WERROR.
+ * javac.in: Handle stripping of arguments which
+ take parameters, specifically -Xmaxwarns.
+ * NEWS: Updated.
+
+2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1714: Update PaX support to detect running PaX
+ kernel and use newer tools
+ * Makefile.am:
+ (clean-local): Remove clean-icedtea, clean-icedtea-debug
+ and clean-icedtea-ecj; pulled in by dependents.
+ (.PHONY): Add clean-runnable-icedtea, clean-runnable-icedtea-debug
+ and clean-runnable-icedtea-ecj.
+ (runnable-icedtea): Depend on icedtea and pax-mark-vm.
+ (clean-runnable-icedtea): Clean stamp.
+ (icedtea-against-icedtea): Depend on runnable-icedtea rather
+ than icedtea and pax-mark-vm.
+ (clean-icedtea-against-icedtea): Depend on clean-runnable-icedtea rather
+ than clean-pax-mark-vm.
+ (runnable-icedtea-debug): Depend on icedtea-debug and pax-mark-vm-debug.
+ (clean-runnable-icedtea-debug): Clean stamp.
+ (icedtea-debug-against-icedtea): Depend on runnable-icedtea-debug rather
+ than icedtea-debug and pax-mark-vm-debug.
+ (clean-icedtea-debug-against-icedtea): Depend on clean-runnable-icedtea-debug
+ rather than clean-pax-mark-vm.
+ (add-archive): Depend on runnable-icedtea as the target executes java.
+ (add-archive-debug): Likewise with runnable-icedtea-debug.
+ (check-crypto): Depend on runnable-icedtea as the target executes java.
+ (check-crypto-debug): Likewise with runnable-icedtea-debug.
+ (runnable-icedtea-ecj): Depend on icedtea-ecj and pax-mark-vm-ecj.
+ (clean-runnable-icedtea-ecj): Clean stamp.
+ (icedtea-against-ecj): Depend on runnable-icedtea-ecj rather
+ than icedtea-ecj and pax-mark-vm-ecj.
+ (clean-icedtea-against-ecj): Depend on clean-runnable-icedtea-ecj
+ rather than clean-pax-mark-vm.
+ (add-archive-ecj): Depend on runnable-icedtea-ecj as the target executes java.
+ (check-crypto-boot): Depend on runnable-icedtea-ecj as the target executes java.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_HAS_PAX): New macro to detect whether the running
+ kernel uses PaX.
+ (IT_WITH_PAX): Rewritten to search for PaX tools -
+ currently paxmark.sh, paxctl-ng, chpax and paxctl -
+ and fail if a tool isn't found and a PaX kernel is
+ being used.
+
+2014-03-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated.
+ * patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch,
+ * patches/openjdk/8013057-detect_mmap_commit_failures.patch,
+ * patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch:
+ Backports to improve mmap failure output.
+
+2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/linker-libs-order.patch:
+ Regenerate, removing upstreamed fragment.
+
+2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b31.
+
2014-01-30 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.11.15 release notes.
diff -r 963a9ab43d7f -r d755adce0a9b Makefile.am
--- a/Makefile.am Thu Jan 30 21:38:08 2014 +0000
+++ b/Makefile.am Thu Apr 10 11:29:11 2014 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 21_jan_2014
OPENJDK_SHA256SUM = ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475
-OPENJDK_VERSION = b30
+OPENJDK_VERSION = b31
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -286,9 +286,6 @@
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
-SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch
-SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch
-
if ENABLE_LCMS2
LCMS_PATCHES = \
patches/openjdk/lcms2/6523398-writing_tags.patch \
@@ -306,37 +303,23 @@
patches/openjdk/lcms2/bundled/8007925-improve_cmsstagealloclabv2tov4curves.patch \
patches/openjdk/lcms2/bundled/8009654-cmsnamed_stability.patch \
patches/openjdk/lcms2/bundled/7042594-tck_failure.patch \
- patches/openjdk/lcms2/bundled/8007927-improve_cmsallocprofilesequencedescription.patch
+ patches/openjdk/lcms2/bundled/8007927-improve_cmsallocprofilesequencedescription.patch \
+ patches/security/20131015/8014098-better_profile_validation.patch \
+ patches/security/20140415/8031335-better_colour_profiling.patch
endif
else
LCMS_PATCHES = \
patches/lcms.patch
endif
+UPSTREAMED_PATCHES =
+
ICEDTEA_PATCHES = \
$(DROP_PATCHES) \
$(SECURITY_PATCHES) \
+ $(UPSTREAMED_PATCHES) \
patches/openjdk/6733501-icedtea_lcms_test.patch \
$(LCMS_PATCHES) \
- patches/openjdk/4993545-nativeinlightfixer.patch \
- patches/openjdk/6637796-set_bounds.patch \
- patches/openjdk/6607660-treelock.patch \
- patches/openjdk/6607170-request_focus.patch \
- patches/openjdk/4685768-focus.patch \
- patches/openjdk/6616323-component_array.patch \
- patches/openjdk/6682046-shape_calculation.patch \
- patches/openjdk/6797195-hw_lw_mixing.patch \
- patches/openjdk/6725214-direct3d-01.patch \
- patches/openjdk/6748082-isDisplayLocal.patch \
- patches/openjdk/6633275-shaped_translucent_windows.patch \
- $(SPECIAL_SECURITY_PATCH_1) \
- patches/openjdk/6769607-modal-hangs.patch \
- patches/openjdk/6791612-opengl-jni-fix.patch \
- patches/openjdk/6755274-glgetstring-crash.patch \
- patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
- patches/openjdk/6693253-security_warning.patch \
- patches/openjdk/6444769-windowwithwarningtest.patch \
- patches/openjdk/6656651-windows_lcd_glyphs.patch \
patches/openjdk/6791502-invalid_icc_profile.patch \
patches/openjdk/6793818-jpegimagereader_too_greedy.patch \
patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch \
@@ -356,7 +339,6 @@
patches/headers.patch \
patches/gcc-suffix.patch \
patches/libraries-splashscreen.patch \
- $(SPECIAL_SECURITY_PATCH_2) \
patches/uname.patch \
patches/nomotif-6706121.patch \
patches/nomotif.patch \
@@ -497,7 +479,6 @@
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch \
- patches/merge_fix.patch \
patches/traceable.patch \
patches/pr1319-support_giflib_5.patch \
patches/openjdk/6718364-inference_failure.patch \
@@ -630,7 +611,10 @@
patches/windows-jdk-sizecalc.patch \
patches/shark_fixes_from_8003868.patch \
patches/8003992_support_6.patch \
- patches/shark-drop_compile_method_arg_following_7083786.patch
+ patches/shark-drop_compile_method_arg_following_7083786.patch \
+ patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch \
+ patches/openjdk/8013057-detect_mmap_commit_failures.patch \
+ patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -775,6 +759,12 @@
ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
endif
+if ENABLE_WERROR
+WERROR_STATUS=true
+else
+WERROR_STATUS=false
+endif
+
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -817,7 +807,8 @@
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
STATIC_CXX="false" \
BUILD_GCC=gcc$(GCC_SUFFIX) \
- BUILD_CXX=g++$(GCC_SUFFIX)
+ BUILD_CXX=g++$(GCC_SUFFIX) \
+ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)"
if ENABLE_CACAO
ICEDTEA_ENV += \
@@ -966,8 +957,8 @@
fi
clean-local: clean-tests $(PULSE_JAVA_CLEAN_TARGET) \
- clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
- clean-overlay clean-native-ecj clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
+ clean-extract clean-ports clean-overlay clean-native-ecj \
+ clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
@@ -1011,7 +1002,8 @@
clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
clean-download-hotspot clean-tests clean-tapset-report jtregcheck clean-pax-mark-vm \
clean-pax-mark-vm-debug clean-pax-mark-vm-ecj clean-check-crypto clean-check-crypto-debug \
- clean-check-crypto-boot clean-cryptocheck
+ clean-check-crypto-boot clean-cryptocheck clean-runnable-icedtea clean-runnable-icedtea-debug \
+ clean-runnable-icedtea-ecj
env:
@echo 'unset JAVA_HOME'
@@ -1720,31 +1712,44 @@
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-debug.stamp
-stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp \
+stamps/runnable-icedtea.stamp: stamps/icedtea.stamp stamps/pax-mark-vm.stamp
+ mkdir -p stamps
+ touch $@
+
+clean-runnable-icedtea: clean-icedtea clean-pax-mark-vm
+ rm -f stamps/runnable-icedtea.stamp
+
+stamps/icedtea-against-icedtea.stamp: stamps/runnable-icedtea.stamp \
stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
- stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/pax-mark-vm.stamp \
- stamps/check-crypto.stamp
+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/check-crypto.stamp
mkdir -p stamps
touch $@
clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
- clean-add-archive clean-pax-mark-vm clean-check-crypto
+ clean-add-archive clean-check-crypto clean-runnable-icedtea
rm -f stamps/icedtea-against-icedtea.stamp
-stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
+stamps/runnable-icedtea-debug.stamp: stamps/icedtea-debug.stamp stamps/pax-mark-vm-debug.stamp
+ mkdir -p stamps
+ touch $@
+
+clean-runnable-icedtea-debug: clean-icedtea-debug clean-pax-mark-vm-debug
+ rm -f stamps/runnable-icedtea-debug.stamp
+
+stamps/icedtea-debug-against-icedtea.stamp: stamps/runnable-icedtea-debug.stamp \
stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp \
- stamps/pax-mark-vm-debug.stamp stamps/check-crypto-debug.stamp
+ stamps/check-crypto-debug.stamp
mkdir -p stamps
touch $@
clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
- clean-add-archive-debug clean-pax-mark-vm-debug clean-check-crypto-debug
+ clean-add-archive-debug clean-runnable-icedtea-debug clean-check-crypto-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -1986,7 +1991,7 @@
fi
rm -f stamps/add-tzdata-support-debug.stamp
-stamps/add-archive.stamp: stamps/icedtea.stamp
+stamps/add-archive.stamp: stamps/runnable-icedtea.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2002,7 +2007,7 @@
rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive.stamp
-stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
+stamps/add-archive-debug.stamp: stamps/runnable-icedtea-debug.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2036,7 +2041,7 @@
clean-pax-mark-vm-debug:
rm -f stamps/pax-mark-vm-debug.stamp
-stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/runnable-icedtea.stamp
if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
@@ -2046,7 +2051,7 @@
clean-check-crypto:
rm -f stamps/check-crypto.stamp
-stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/runnable-icedtea-debug.stamp
if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
@@ -2075,14 +2080,21 @@
rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-ecj.stamp
-stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
- stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
- stamps/add-archive-ecj.stamp stamps/pax-mark-vm-ecj.stamp stamps/check-crypto-boot.stamp
+stamps/runnable-icedtea-ecj.stamp: stamps/icedtea-ecj.stamp stamps/pax-mark-vm-ecj.stamp
mkdir -p stamps
touch $@
+clean-runnable-icedtea-ecj: clean-icedtea-ecj clean-pax-mark-vm-ecj
+ rm -f stamps/runnable-icedtea-ecj.stamp
+
+stamps/icedtea-against-ecj.stamp: stamps/runnable-icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
+ stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
+ stamps/add-archive-ecj.stamp stamps/check-crypto-boot.stamp
+ mkdir -p stamps
+ touch $@
+
clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
- clean-add-tzdata-support-ecj clean-add-archive-ecj clean-pax-mark-vm-ecj clean-check-crypto-boot
+ clean-add-tzdata-support-ecj clean-add-archive-ecj clean-runnable-icedtea-ecj clean-check-crypto-boot
rm -f stamps/icedtea-against-ecj.stamp
stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -2205,7 +2217,7 @@
fi
rm -f stamps/add-tzdata-support-ecj.stamp
-stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
+stamps/add-archive-ecj.stamp: stamps/runnable-icedtea-ecj.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2230,7 +2242,7 @@
clean-pax-mark-vm-ecj:
rm -f stamps/pax-mark-vm-ecj.stamp
-stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-ecj.stamp
+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/runnable-icedtea-ecj.stamp
if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
diff -r 963a9ab43d7f -r d755adce0a9b NEWS
--- a/NEWS Thu Jan 30 21:38:08 2014 +0000
+++ b/NEWS Thu Apr 10 11:29:11 2014 +0100
@@ -14,6 +14,21 @@
New in release 1.14.0 (201X-XX-XX):
+* Backports
+ - 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
+
+New in release 1.13.2 (2014-03-28):
+
+* Backports
+ - S7110396: Sound code fails to build with gcc 4.6 on multiarch Linux systems
+ - S8035893: JVM_GetVersionInfo fails to zero structure
+ - OJ29: JDK fails to zero jdk_version_info correctly
+* Bug fixes
+ - PR1714, G498288: Update PaX support to detect running PaX kernel and use newer tools
+ - PR1712, G455426: Allow -Werror to be turned off in the HotSpot build
+
New in release 1.11.15 (2014-01-21):
* Security fixes
diff -r 963a9ab43d7f -r d755adce0a9b acinclude.m4
--- a/acinclude.m4 Thu Jan 30 21:38:08 2014 +0000
+++ b/acinclude.m4 Thu Apr 10 11:29:11 2014 +0100
@@ -2139,48 +2139,79 @@
AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
])
+AC_DEFUN_ONCE([IT_HAS_PAX],
+[
+ AC_MSG_CHECKING([if a PaX kernel is in use])
+ if cat /proc/self/status | grep '^PaX' >&AS_MESSAGE_LOG_FD 2>&1; then
+ pax_active=yes;
+ else
+ pax_active=no;
+ fi
+ AC_MSG_RESULT([${pax_active}])
+ AM_CONDITIONAL([USING_PAX], test x"${pax_active}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_WITH_PAX],
[
- AC_MSG_CHECKING([for pax utility to use])
+ AC_REQUIRE([IT_HAS_PAX])
+ PAX_DEFAULT=/usr/sbin/paxmark.sh
+ AC_MSG_CHECKING([if a PaX utility was specified])
AC_ARG_WITH([pax],
[AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
[
- PAX_COMMAND=${withval}
- if test "x${PAX_COMMAND}" = "xno"; then
- PAX_COMMAND="not specified"
+ if test "x${withval}" = "xyes"; then
+ PAX_COMMAND=no
+ else
+ PAX_COMMAND="${withval}"
fi
],
[
+ PAX_COMMAND=no
+ ])
+ AC_MSG_RESULT(${PAX_COMMAND})
+ if test "x${PAX_COMMAND}" == "xno"; then
+ PAX_COMMAND=${PAX_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
+ if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PAX_COMMAND=""
+ AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "chpax")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl")
+ fi
+ if test -z "${PAX_COMMAND}"; then
More information about the distro-pkg-dev
mailing list