From 15258fc73b4d8029867c0634a99dd08c81e1a955 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Oct 17 2013 11:01:16 +0000 Subject: Added headless support and main archs. updated to security icedtea 2.3 --- diff --git a/.gitignore b/.gitignore index d81e37b..051ca65 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /openjdk-icedtea-2.4.1.tar.xz /openjdk-icedtea-2.4.2.tar.xz /systemtap-tapset-2013-10-02.tar.gz +/openjdk-icedtea-2.4.3.tar.xz diff --git a/RH661505-toBeReverted.patch b/RH661505-toBeReverted.patch deleted file mode 100644 index a3476a4..0000000 --- a/RH661505-toBeReverted.patch +++ /dev/null @@ -1,38 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1378467880 -3600 -# Node ID 3372405e49a9e5cd27af64e16eb7e44539ea3339 -# Parent b2611b1a750cf38b795d1df24c5bea9b9c246e0f -RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors - -diff -r b2611b1a750c -r 3372405e49a9 src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Wed Sep 04 18:20:38 2013 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Fri Sep 06 12:44:40 2013 +0100 -@@ -1454,6 +1454,8 @@ - "[S"); - } - -+#define JPEG_APP1 (JPEG_APP0 + 1) /* EXIF APP1 marker code */ -+ - JNIEXPORT jlong JNICALL - Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader - (JNIEnv *env, -@@ -1507,6 +1509,7 @@ - - // Set up to keep any APP2 markers, as these might contain ICC profile - // data -+ jpegsavemarkers(cinfo, JPEG_APP1, 0xFFFF); - jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF); - - /* -@@ -1569,8 +1572,6 @@ - imageio_init_source((j_decompress_ptr) cinfo); - } - --#define JPEG_APP1 (JPEG_APP0 + 1) /* EXIF APP1 marker code */ -- - /* - * For EXIF images, the APP1 will appear immediately after the SOI, - * so it's safe to only look at the first marker in the list. - - diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index f533d83..1fca884 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -1,7 +1,7 @@ # If debug is 1, OpenJDK is built with all debug info present. %global debug 0 -%global icedtea_version 2.4.2 +%global icedtea_version 2.4.3 %global icedtea_version_arm32 2.3.12 %global hg_tag icedtea-{icedtea_version} @@ -104,9 +104,9 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 40 +%global updatever 45 #Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version: -%global buildver 60 +%global buildver 15 # Keep priority on 6digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -150,7 +150,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.60 -Release: %{icedtea_version}.11%{?dist} +Release: %{icedtea_version}.0%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -248,9 +248,6 @@ Patch6: %{name}-debuginfo.patch Patch100: rhino.patch Patch1000: rhino-2.3.patch -# Type fixing for s390 -Patch101: zero-s8024914.patch -Patch102: zero-size_t.patch # Patch for PPC/PPC64 Patch104: %{name}-ppc-zero-jdk.patch @@ -258,11 +255,6 @@ Patch105: %{name}-ppc-zero-hotspot.patch Patch106: %{name}-freetype-check-fix.patch -# Zero fixes -Patch1100: zero-entry_frame_call_wrapper.patch -Patch1110: zero-zero_build.patch -Patch1120: zero-gcdrainstacktargetsize.patch - # allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable Patch200: abrt_friendly_hs_log_jdk7.patch @@ -284,7 +276,6 @@ Patch401: 657854-openjdk7.patch Patch402: gstackbounds.patch Patch4020: gstackbounds-2.3.patch Patch403: PStack-808293.patch -Patch404: RH661505-toBeReverted.patch # End of tmp patches # Temporary backport of patches already upstream but not in a icedtea7-2.3.X release yet @@ -348,11 +339,40 @@ BuildRequires: prelink BuildRequires: systemtap-sdt-devel %endif +Requires: fontconfig +Requires: xorg-x11-fonts-Type1 +#requires rest of java +Requires: %{name}-headless = %{epoch}:%{version}-%{release} + + +# Standard JPackage base provides. +Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} +Provides: jre-%{origin} = %{epoch}:%{version}-%{release} +Provides: jre-%{javaver} = %{epoch}:%{version}-%{release} +Provides: java-%{javaver} = %{epoch}:%{version}-%{release} +Provides: jre = %{javaver} +Provides: java-%{origin} = %{epoch}:%{version}-%{release} +Provides: java = %{epoch}:%{javaver} +# Standard JPackage extensions provides. +Provides: java-fonts = %{epoch}:%{version} + +# Obsolete older 1.6 packages as it cannot use the new bytecode +Obsoletes: java-1.6.0-openjdk +Obsoletes: java-1.6.0-openjdk-demo +Obsoletes: java-1.6.0-openjdk-devel +Obsoletes: java-1.6.0-openjdk-javadoc +Obsoletes: java-1.6.0-openjdk-src + +%description +The OpenJDK runtime environment. + +%package headless +Summary: The OpenJDK runtime environment without audio and video support +Group: Development/Languages + Requires: rhino Requires: lcms2 >= 2.5 Requires: libjpeg = 6b -Requires: fontconfig -Requires: xorg-x11-fonts-Type1 # Require /etc/pki/java/cacerts. Requires: ca-certificates # Require jpackage-utils for ant. @@ -364,14 +384,13 @@ Requires(post): %{_sbindir}/alternatives # Postun requires alternatives to uninstall tool alternatives. Requires(postun): %{_sbindir}/alternatives -# Standard JPackage base provides. -Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin} = %{epoch}:%{version}-%{release} -Provides: jre-%{javaver} = %{epoch}:%{version}-%{release} -Provides: java-%{javaver} = %{epoch}:%{version}-%{release} -Provides: jre = %{javaver} -Provides: java-%{origin} = %{epoch}:%{version}-%{release} -Provides: java = %{epoch}:%{javaver} +Provides: jre-%{javaver}-%{origin}-headless = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}-headless = %{epoch}:%{version}-%{release} +Provides: jre-%{javaver}-headless = %{epoch}:%{version}-%{release} +Provides: java-%{javaver}-headless = %{epoch}:%{version}-%{release} +Provides: jre-headless = %{javaver} +Provides: java-%{origin}-headless = %{epoch}:%{version}-%{release} +Provides: java-headless = %{epoch}:%{javaver} # Standard JPackage extensions provides. Provides: jndi = %{epoch}:%{version} Provides: jndi-ldap = %{epoch}:%{version} @@ -383,17 +402,9 @@ Provides: jsse = %{epoch}:%{version} Provides: jce = %{epoch}:%{version} Provides: jdbc-stdext = 4.1 Provides: java-sasl = %{epoch}:%{version} -Provides: java-fonts = %{epoch}:%{version} - -# Obsolete older 1.6 packages as it cannot use the new bytecode -Obsoletes: java-1.6.0-openjdk -Obsoletes: java-1.6.0-openjdk-demo -Obsoletes: java-1.6.0-openjdk-devel -Obsoletes: java-1.6.0-openjdk-javadoc -Obsoletes: java-1.6.0-openjdk-src -%description -The OpenJDK runtime environment. +%description headless +The OpenJDK runtime environment without audio and video %package devel Summary: OpenJDK Development Environment @@ -540,14 +551,6 @@ tar xzf %{SOURCE9} %patch6 %endif -# Type fixes for s390 -%patch101 -%ifnarch %{arm} -%patch102 -%patch1100 -%patch1110 -%patch1120 -%endif %patch106 %patch200 @@ -576,8 +579,6 @@ tar xzf %{SOURCE9} %patch502 %patch503 %patch504 -%else -%patch404 -R %endif %build @@ -867,12 +868,41 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \ | grep -v jre/lib/security \ | sed 's|'$RPM_BUILD_ROOT'|%dir |' \ - > %{name}.files + > %{name}.files-headless # Find JRE files. find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \ | grep -v jre/lib/security \ | sed 's|'$RPM_BUILD_ROOT'||' \ - >> %{name}.files + > %{name}.files.all +#split %{name}.files to %{name}.files-headless and %{name}.files +#see https://bugzilla.redhat.com/show_bug.cgi?id=875408 +NOT_HEADLESS=\ +"%{_jvmdir}/%{uniquesuffix}/jre/lib/%{archinstall}/libjsoundalsa.so +%{_jvmdir}/%{uniquesuffix}/jre/lib/%{archinstall}/libpulse-java.so +%{_jvmdir}/%{uniquesuffix}/jre/lib/%{archinstall}/libsplashscreen.so +%{_jvmdir}/%{uniquesuffix}/jre/lib/%{archinstall}/xawt/libmawt.so +%{_jvmdir}/%{uniquesuffix}/jre-abrt/lib/%{archinstall}/libjsoundalsa.so +%{_jvmdir}/%{uniquesuffix}/jre-abrt/lib/%{archinstall}/libpulse-java.so +%{_jvmdir}/%{uniquesuffix}/jre-abrt/lib/%{archinstall}/libsplashscreen.so +%{_jvmdir}/%{uniquesuffix}/jre-abrt/lib/%{archinstall}/xawt/libmawt.so" +#filter %{name}.files from %{name}.files.all to %{name}.files-headless +ALL=`cat %{name}.files.all` +for file in $ALL ; do + INLCUDE="NO" ; + for blacklist in $NOT_HEADLESS ; do +#we can not match normally, because rpmbuild will evaluate !0 result as script failure + q=`expr match "$file" "$blacklist"` || : + l=`expr length "$blacklist"` || : + if [ $q -eq $l ]; then + INLCUDE="YES" ; + fi; + done + if [ "x$INLCUDE" = "xNO" ]; then + echo "$file" >> %{name}.files-headless + else + echo "$file" >> %{name}.files + fi +done # Find demo directories. find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \ @@ -914,10 +944,15 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ echo "" >> accessibility.properties popd +%post +update-desktop-database %{_datadir}/applications &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +exit 0 + # FIXME: identical binaries are copied, not linked. This needs to be # fixed upstream. -%post +%post headless %ifarch %{jit_arches} #see https://bugzilla.redhat.com/show_bug.cgi?id=513605 %{jrebindir}/java -Xshare:dump >/dev/null 2>/dev/null @@ -1043,11 +1078,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : exit 0 %postun - alternatives --remove java %{jrebindir}/java - alternatives --remove jre_%{origin} %{_jvmdir}/%{jredir} - alternatives --remove jre_%{javaver} %{_jvmdir}/%{jredir} - alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} - update-desktop-database %{_datadir}/applications &> /dev/null || : if [ $1 -eq 0 ] ; then @@ -1057,7 +1087,16 @@ fi exit 0 -%posttrans + +%postun headless + alternatives --remove java %{jrebindir}/java + alternatives --remove jre_%{origin} %{_jvmdir}/%{jredir} + alternatives --remove jre_%{javaver} %{_jvmdir}/%{jredir} + alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} + +exit 0 + +%posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post devel @@ -1223,6 +1262,8 @@ done update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir} %{priority} \ --slave %{_jvmjardir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdkdir} +update-desktop-database %{_datadir}/applications &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : exit 0 @@ -1232,8 +1273,19 @@ exit 0 alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdkdir} alternatives --remove java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir} +update-desktop-database %{_datadir}/applications &> /dev/null || : + +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + exit 0 +%posttrans devel +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %post javadoc MAKE_THIS_DEFAULT=0 ID="%{_javadocdir}/java-%{javaver}-%{origin}.*/api" @@ -1277,6 +1329,10 @@ exit 0 %files -f %{name}.files +%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png + + +%files headless -f %{name}.files-headless %defattr(-,root,root,-) %doc %{_jvmdir}/%{sdkdir}/ASSEMBLY_EXCEPTION %doc %{_jvmdir}/%{sdkdir}/LICENSE @@ -1295,7 +1351,6 @@ exit 0 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %config(noreplace) %{_jvmdir}/%{jredir}/lib/logging.properties -%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png %{_mandir}/man1/java-%{uniquesuffix}.1* %{_mandir}/man1/keytool-%{uniquesuffix}.1* %{_mandir}/man1/orbd-%{uniquesuffix}.1* @@ -1392,6 +1447,10 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Thu Oct 17 2013 Jiri Vanek - 1.7.0.40-2.4.3.0.f20 +- updated to new CPU sources 2.4.3 +- jdk splitted to headless and rest + * Fri Oct 04 2013 Jiri Vanek - 1.7.0.40-2.4.2.11.f20 - another tapset fix diff --git a/sources b/sources index bbcff48..7059ab1 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz 1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz 785b5ff80beef8cc095e25345c6c8242 systemtap-tapset-2013-10-02.tar.gz 8d4f3df0b264c331187696bb49306634 openjdk-icedtea-2.3.12.tar.xz -4bf2b37d85cf71fc3611aa772ffe1553 openjdk-icedtea-2.4.2.tar.xz +fd22afba9cc55754abcd584aa0b9aaaa openjdk-icedtea-2.4.3.tar.xz diff --git a/zero-entry_frame_call_wrapper.patch b/zero-entry_frame_call_wrapper.patch deleted file mode 100644 index 196b913..0000000 --- a/zero-entry_frame_call_wrapper.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1378870967 -3600 -# Wed Sep 11 04:42:47 2013 +0100 -# Node ID 09f439dfd7b9d6e022f7af71c328b5b4b6a36c23 -# Parent 24b23eb187fcfb801eb3d479b30e3321f9f5dfd6 -Fix Zero following changes to entry_frame_call_wrapper in 8016131 - -diff --git a/src/cpu/zero/vm/entryFrame_zero.hpp b/src/cpu/zero/vm/entryFrame_zero.hpp ---- openjdk/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp -+++ openjdk/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp -@@ -58,8 +58,8 @@ - JavaCallWrapper* call_wrapper, - TRAPS); - public: -- JavaCallWrapper *call_wrapper() const { -- return (JavaCallWrapper *) value_of_word(call_wrapper_off); -+ JavaCallWrapper **call_wrapper() const { -+ return (JavaCallWrapper **) addr_of_word(call_wrapper_off); - } - - public: -diff --git a/src/cpu/zero/vm/frame_zero.inline.hpp b/src/cpu/zero/vm/frame_zero.inline.hpp ---- openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp -+++ openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp -@@ -132,7 +132,7 @@ - return fp(); - } - --inline JavaCallWrapper* frame::entry_frame_call_wrapper() const { -+inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const { - return zero_entryframe()->call_wrapper(); - } - diff --git a/zero-gcdrainstacktargetsize.patch b/zero-gcdrainstacktargetsize.patch deleted file mode 100644 index a8b4ef7..0000000 --- a/zero-gcdrainstacktargetsize.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1379536490 -3600 -# Wed Sep 18 21:34:50 2013 +0100 -# Node ID af221c82682c974e06cc78b24808262d9ffc5af2 -# Parent 4fc9d4d964adf1f5316d81d1db1813ffd9f2286b -Cast should use same type as GCDrainStackTargetSize (uintx). - -diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -@@ -3632,7 +3632,7 @@ - // of things to do) or totally (at the very end). - size_t target_size; - if (partially) { -- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize); -+ target_size = MIN2((uintx)_task_queue->max_elems()/3, GCDrainStackTargetSize); - } else { - target_size = 0; - } diff --git a/zero-s8024914.patch b/zero-s8024914.patch deleted file mode 100644 index d1c8d80..0000000 --- a/zero-s8024914.patch +++ /dev/null @@ -1,58 +0,0 @@ -# HG changeset patch -# User tschatzl -# Date 1379412251 -7200 -# Tue Sep 17 12:04:11 2013 +0200 -# Node ID c39d06e6c10d9b6ae8feab2eb872f0be91b08d4f -# Parent af221c82682c974e06cc78b24808262d9ffc5af2 -8024914: Swapped usage of idx_t and bm_word_t types in bitMap.inline.hpp -Summary: Incorrect usage of idx_t where bm_word_t is appropriate. -Reviewed-by: tschatzl, brutisso -Contributed-by: Dan Horak - -diff --git a/src/share/vm/utilities/bitMap.inline.hpp b/src/share/vm/utilities/bitMap.inline.hpp ---- openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp -@@ -52,16 +52,16 @@ - - inline bool BitMap::par_set_bit(idx_t bit) { - verify_index(bit); -- volatile idx_t* const addr = word_addr(bit); -- const idx_t mask = bit_mask(bit); -- idx_t old_val = *addr; -+ volatile bm_word_t* const addr = word_addr(bit); -+ const bm_word_t mask = bit_mask(bit); -+ bm_word_t old_val = *addr; - - do { -- const idx_t new_val = old_val | mask; -+ const bm_word_t new_val = old_val | mask; - if (new_val == old_val) { - return false; // Someone else beat us to it. - } -- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val, -+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val, - (volatile void*) addr, - (void*) old_val); - if (cur_val == old_val) { -@@ -73,16 +73,16 @@ - - inline bool BitMap::par_clear_bit(idx_t bit) { - verify_index(bit); -- volatile idx_t* const addr = word_addr(bit); -- const idx_t mask = ~bit_mask(bit); -- idx_t old_val = *addr; -+ volatile bm_word_t* const addr = word_addr(bit); -+ const bm_word_t mask = ~bit_mask(bit); -+ bm_word_t old_val = *addr; - - do { -- const idx_t new_val = old_val & mask; -+ const bm_word_t new_val = old_val & mask; - if (new_val == old_val) { - return false; // Someone else beat us to it. - } -- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val, -+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val, - (volatile void*) addr, - (void*) old_val); - if (cur_val == old_val) { diff --git a/zero-size_t.patch b/zero-size_t.patch deleted file mode 100644 index f898233..0000000 --- a/zero-size_t.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff --git a/src/share/vm/compiler/methodLiveness.cpp b/src/share/vm/compiler/methodLiveness.cpp ---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp -+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp -@@ -572,15 +572,15 @@ - - - MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) : -- _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), -+ _gen((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), - analyzer->bit_map_size_bits()), -- _kill((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), -+ _kill((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), - analyzer->bit_map_size_bits()), -- _entry((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), -+ _entry((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), - analyzer->bit_map_size_bits()), -- _normal_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), -+ _normal_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), - analyzer->bit_map_size_bits()), -- _exception_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), -+ _exception_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()), - analyzer->bit_map_size_bits()), - _last_bci(-1) { - _analyzer = analyzer; -@@ -998,7 +998,7 @@ - } - - MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) { -- MethodLivenessResult answer(NEW_RESOURCE_ARRAY(size_t, _analyzer->bit_map_size_words()), -+ MethodLivenessResult answer(NEW_RESOURCE_ARRAY(BitMap::bm_word_t, _analyzer->bit_map_size_words()), - _analyzer->bit_map_size_bits()); - answer.set_is_valid(); - -diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp -@@ -2678,7 +2678,7 @@ - if (ResizeOldPLAB && CMSOldPLABResizeQuicker) { - size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); - n_blks += CMSOldPLABReactivityFactor*multiple*n_blks; -- n_blks = MIN2(n_blks, CMSOldPLABMax); -+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax); - } - assert(n_blks > 0, "Error"); - _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); -diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp -@@ -1735,7 +1735,7 @@ - - verify_region_sets_optional(); - -- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes); -+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes); - ergo_verbose1(ErgoHeapSizing, - "attempt heap expansion", - ergo_format_reason("allocation request failed") -diff --git a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp -@@ -840,7 +840,7 @@ - // This can be done by either mutator threads together with the - // concurrent refinement threads or GC threads. - int HeapRegionRemSet::num_par_rem_sets() { -- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads); -+ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads); - } - - HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa, -diff --git a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp -@@ -192,7 +192,7 @@ - const size_t num_overflow_elems = of_stack->size(); - const size_t space_available = queue->max_elems() - queue->size(); - const size_t num_take_elems = MIN3(space_available / 4, -- ParGCDesiredObjsFromOverflowList, -+ (size_t)ParGCDesiredObjsFromOverflowList, - num_overflow_elems); - // Transfer the most recent num_take_elems from the overflow - // stack to our work queue. -diff --git a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp -@@ -69,7 +69,7 @@ - if (_virtual_space != NULL && _virtual_space->expand_by(_reserved_byte_size)) { - _region_start = covered_region.start(); - _region_size = covered_region.word_size(); -- idx_t* map = (idx_t*)_virtual_space->reserved_low_addr(); -+ BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr(); - _beg_bits.set_map(map); - _beg_bits.set_size(bits / 2); - _end_bits.set_map(map + words / 2); -diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp ---- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp -@@ -361,7 +361,7 @@ - // generally small compared to the NewRatio calculation. - _min_gen0_size = NewSize; - desired_new_size = NewSize; -- max_new_size = MAX2(max_new_size, NewSize); -+ max_new_size = MAX2(max_new_size, (size_t)NewSize); - } else { - // For the case where NewSize is the default, use NewRatio - // to size the minimum and initial generation sizes. -@@ -369,10 +369,10 @@ - // NewRatio is overly large, the resulting sizes can be too - // small. - _min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()), -- NewSize); -+ (size_t)NewSize); - desired_new_size = - MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()), -- NewSize); -+ (size_t)NewSize); - } - - assert(_min_gen0_size > 0, "Sanity check"); -@@ -427,14 +427,14 @@ - // Adjust gen0 down to accomodate OldSize - *gen0_size_ptr = heap_size - min_gen0_size; - *gen0_size_ptr = -- MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()), -+ MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()), - min_alignment()); - assert(*gen0_size_ptr > 0, "Min gen0 is too large"); - result = true; - } else { - *gen1_size_ptr = heap_size - *gen0_size_ptr; - *gen1_size_ptr = -- MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()), -+ MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()), - min_alignment()); - } - } -@@ -458,7 +458,7 @@ - // for setting the gen1 maximum. - _max_gen1_size = max_heap_byte_size() - _max_gen0_size; - _max_gen1_size = -- MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()), -+ MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()), - min_alignment()); - // If no explicit command line flag has been set for the - // gen1 size, use what is left for gen1. -@@ -472,11 +472,11 @@ - "gen0 has an unexpected minimum size"); - set_min_gen1_size(min_heap_byte_size() - min_gen0_size()); - set_min_gen1_size( -- MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()), -+ MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()), - min_alignment())); - set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size()); - set_initial_gen1_size( -- MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()), -+ MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()), - min_alignment())); - - } else { -diff --git a/src/share/vm/oops/objArrayKlass.inline.hpp b/src/share/vm/oops/objArrayKlass.inline.hpp ---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp -@@ -46,7 +46,7 @@ - const size_t beg_index = size_t(index); - assert(beg_index < len || len == 0, "index too large"); - -- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); -+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride); - const size_t end_index = beg_index + stride; - T* const base = (T*)a->base(); - T* const beg = base + beg_index; -@@ -80,7 +80,7 @@ - const size_t beg_index = size_t(index); - assert(beg_index < len || len == 0, "index too large"); - -- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); -+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride); - const size_t end_index = beg_index + stride; - T* const base = (T*)a->base(); - T* const beg = base + beg_index; -diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp ---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp -@@ -1240,7 +1240,7 @@ - // so it's NewRatio x of NewSize. - if (FLAG_IS_DEFAULT(OldSize)) { - if (max_heap > NewSize) { -- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize)); -+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize)); - if (PrintGCDetails && Verbose) { - // Too early to use gclog_or_tty - tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize); diff --git a/zero-zero_build.patch b/zero-zero_build.patch deleted file mode 100644 index c285fdd..0000000 --- a/zero-zero_build.patch +++ /dev/null @@ -1,38 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1378914912 -3600 -# Wed Sep 11 16:55:12 2013 +0100 -# Node ID 56f4e181b8d485a01f125f2c681159cc940f6c26 -# Parent 09f439dfd7b9d6e022f7af71c328b5b4b6a36c23 -Set ZERO_BUILD in flags.make so it is set on rebuilds - -diff --git a/make/bsd/makefiles/buildtree.make b/make/bsd/makefiles/buildtree.make ---- openjdk/hotspot/make/bsd/makefiles/buildtree.make -+++ openjdk/hotspot/make/bsd/makefiles/buildtree.make -@@ -215,6 +215,7 @@ - echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ - echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ - echo "OPENJDK = $(OPENJDK)"; \ -+ echo "ZERO_BUILD = $(ZERO_BUILD)"; \ - echo; \ - echo "# Used for platform dispatching"; \ - echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ -diff --git a/make/linux/makefiles/buildtree.make b/make/linux/makefiles/buildtree.make ---- openjdk/hotspot/make/linux/makefiles/buildtree.make -+++ openjdk/hotspot/make/linux/makefiles/buildtree.make -@@ -195,7 +195,6 @@ - $(BUILDTREE_COMMENT); \ - echo; \ - echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ -- echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \ - sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ - echo; \ - echo "GAMMADIR = $(GAMMADIR)"; \ -@@ -210,6 +209,7 @@ - echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ - echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ - echo "OPENJDK = $(OPENJDK)"; \ -+ echo "ZERO_BUILD = $(ZERO_BUILD)"; \ - echo; \ - echo "# Used for platform dispatching"; \ - echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \