Hello community,
here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2013-07-02 12:24:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2013-06-06 14:58:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2013-07-02 12:24:51.000000000 +0200
@@ -1,0 +2,47 @@
+Tue Jun 18 07:20:59 UTC 2013 - mvyskocil@suse.com
+
+- update to icedtea-2.4.0 (based on oracle jdk7u40)
+* OpenJDK (see NEWS for full listing)
+ - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field.
+ - PR1206, S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK
+* Backports
+ - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams
+ - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
+* Bug fixes
+ - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use
+ - Add NSS (commented out) to other platforms.
+ - Allow multiple PKCS11 library initialisation to be a non-critical error.
+ - Complete switch from local zlib patch to upstream version.
+ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set.
+ - Provide support for using PKCS11 provider with NSS
+ - Remove file apparently removed as part of upstreaming of Zero.
+ - Revert 7060849
+ - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy.
+ - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg
+ - PR716: IcedTea7 should bootstrap with IcedTea6
+ - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6.
+ - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set
+ - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167.
+ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set.
+ - Make sure libffi cflags and libs are used.
+ - PR1378: Add AArch64 support to Zero
+ - PR1170: Ensure unlimited crypto policy is in place.
+ - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive
+ - PR1358: Make XRender mandatory
+ - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
+ - PR1435, D657854: OpenJDK 7 returns incorrect TrueType font metrics
+ - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order
+* JamVM
+ - JSR 335: (lambda expressions) initial hack
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - Fix invokesuper check in invokespecial opcode
+ - Fix non-direct interpreter invokespecial super-class check
+ - When GC'ing a native method don't try to free code
+ - Do not free unprepared Miranda method code data
+ - Set anonymous class protection domain
+ - JVM_IsVMGeneratedMethodIx stub
+ - Dummy implementation of sun.misc.Perf natives
+- separate vm for zero is no longer needed
+- drop java-1.7.0-openjdk-aarch64.patch (upstream: PR1378)
+
+-------------------------------------------------------------------
Old:
----
12b96a57263c.tar.gz
47a6bf94ce11.tar.gz
8e91101e36f0.tar.gz
ad5a321edea2.tar.gz
b1877762d45c.tar.gz
d2142901bcb7.tar.gz
fd956199cb82.tar.gz
icedtea-2.3.9.tar.gz
icedtea-2.3.9.tar.gz.sig
jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
java-1.7.0-openjdk-aarch64.patch
New:
----
29ce11184945.tar.gz
5eaf3bca7f68.tar.gz
71d5ec2f3dfb.tar.gz
9c74cb4a3ae8.tar.gz
9d2007a13c02.tar.gz
c67fd7874b1a.tar.gz
ffb1b6bc4750.tar.gz
icedtea-2.4.0.tar.gz
icedtea-2.4.0.tar.gz.sig
jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.y3N1Oa/_old 2013-07-02 12:24:54.000000000 +0200
+++ /var/tmp/diff_new_pack.y3N1Oa/_new 2013-07-02 12:24:54.000000000 +0200
@@ -19,14 +19,6 @@
%define gcjbootstrap 0
%define jit_arches %{ix86} x86_64
-# Turn on/off some features depending on openSUSE version
-%define with_systemtap 0
-
-%ifarch %{jit_arches}
-%if 0%{?suse_version} >= 1130
-%define with_systemtap 1
-%endif
-%endif
%ifarch %arm
%bcond_without jamvm
@@ -42,11 +34,6 @@
%endif
%bcond_with zero
-# XXX: systemtap does not work with gcj
-%if %{gcjbootstrap}
-%define with_systemtap 0
-%endif
-
#XXX: maybe 12.1 with pa 1.1 will work (?)
%if 0%{?suse_version} >= 1140
%define with_pulseaudio 1
@@ -57,7 +44,7 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedtea_version 2.3.9
+%define icedtea_version 2.4.0
%define hg_tag icedtea-{icedtea_version}-branchpoint
%define openjdkdate 27_jun_2011
@@ -116,7 +103,7 @@
%define jvmjardir %{_jvmjardir}/%{sdkdir}
%define jvmjarlink %{_jvmjardir}/%{sdklnk}
-%ifarch %{jit_arches}
+# % ifarch %{jit_arches}
# Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir,
# but currently systemtap doesn't support that, so we have to
@@ -128,7 +115,7 @@
#%define tapsetdir /usr/share/systemtap/tapset/%{sdkdir}
%define tapsetroot %{_datadir}/systemtap
%define tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
-%endif
+# % endif
# Prevent brp-java-repack-jars from being run.
%define __jar_repack 0
@@ -157,16 +144,16 @@
Source3: mauve-%{mauvedate}.tar.gz
Source4: mauve_tests
-Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/12b96a57...
-Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/47...
-Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d21...
-Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b1...
-Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/8e91...
-Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archiv...
-Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/...
+Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/9c74cb4a...
+Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/71...
+Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/5ea...
+Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/9d...
+Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/29ce...
+Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archiv...
+Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/...
# zero compatible hotspot
-Source12: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/...
-Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29...
+#TODO: not needed Source12: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/...
+Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-7c8dceb90880616b7dd6...
#Source1000: java-1_7_0-openjdk-rpmlintrc
# those properties are for opeSUSE only
@@ -212,7 +199,7 @@
# Patches for AArch64
Patch107: java-1.7.0-openjdk-fork.patch
-Patch108: java-1.7.0-openjdk-aarch64.patch
+#Already upstream: Patch108: java-1.7.0-openjdk-aarch64.patch
#
# Optional component packages
@@ -294,9 +281,7 @@
%endif
#system tap
-%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel >= 1.0
-%endif
%if 0%{?suse_version} > 1110
#fixing RedHat bug #648499
@@ -344,9 +329,7 @@
Requires: tzdata-java
Requires(pre): update-alternatives
-%if %{with_systemtap}
Recommends: systemtap >= 1.0
-%endif
# Standard JPackage base provides.
Provides: java = %{javaver}
@@ -521,9 +504,6 @@
%if %{with_pulseaudio}
--enable-pulse-java \
%endif
-%if %{with_systemtap}
- --enable-systemtap \
-%endif
--enable-nss \
%if %{with zero}
--enable-zero \
@@ -541,11 +521,7 @@
--with-jaxws-src-zip=%{SOURCE8} \
--with-jdk-src-zip=%{SOURCE9} \
--with-langtools-src-zip=%{SOURCE10} \
-%if %{with zero}
- --with-hotspot-src-zip=%{SOURCE12}
-%else
--with-hotspot-src-zip=%{SOURCE11}
-%endif
make patch
@@ -568,7 +544,7 @@
# Typo fixes
qpatch -p0 %{PATCH101}
-#qpatch -p0 %{PATCH102}
+qpatch -p0 %{PATCH102}
# Arm fixes
qpatch -p0 %{PATCH103}
@@ -582,7 +558,6 @@
%if %{suse_version} >= 1230
# AArch64 fixes - EM_AARCH64 does work since 12.3
qpatch -p1 %{PATCH107}
-qpatch -p1 %{PATCH108}
%endif
#SUSE specific fixes
@@ -682,7 +657,6 @@
# Install a fontconfig file which don't reffer to agfa-fonts on openSUSE
cp %{S:1001} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/
- %if %{with_systemtap}
popd
# Install systemtap support files.
@@ -694,7 +668,6 @@
popd
pushd %{buildoutputdir}/j2sdk-image
- %endif
# Install extension symlinks.
install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
@@ -1045,6 +1018,7 @@
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjsig.so
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so
%config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg
+%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/Xusage.txt
%{_jvmdir}/%{sdkdir}/jre/lib/applet/
%{_jvmdir}/%{sdkdir}/jre/lib/cmm/
@@ -1069,6 +1043,8 @@
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
#bnc#637224
%config(noreplace) %{_jvmdir}/%{jredir}/lib/fontconfig.*
%config(noreplace) %{_jvmdir}/%{jredir}/lib/*.properties
@@ -1097,13 +1073,11 @@
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
-%if %{with_systemtap}
%dir %{_datadir}/systemtap/tapset
%dir %{tapsetdir}
%dir %{_jvmdir}/%{sdkdir}/tapset
%{tapsetdir}/*
%{_jvmdir}/%{sdkdir}/tapset/*
-%endif
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
++++++ 47a6bf94ce11.tar.gz -> 29ce11184945.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/47a6bf94ce11.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/29ce11184945.tar.gz differ: char 5, line 1
++++++ 12b96a57263c.tar.gz -> 5eaf3bca7f68.tar.gz ++++++
++++ 604543 lines of diff (skipped)
++++++ 12b96a57263c.tar.gz -> 71d5ec2f3dfb.tar.gz ++++++
++++ 250111 lines of diff (skipped)
++++++ 12b96a57263c.tar.gz -> 9c74cb4a3ae8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/.hgtags new/icedtea7-forest-2-4-9c74cb4a3ae8/.hgtags
--- old/icedtea7-forest-2-3-12b96a57263c/.hgtags 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/.hgtags 2013-06-07 20:48:34.000000000 +0200
@@ -206,15 +206,7 @@
d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23
e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24
f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30
-dda13866dd2855c304ba3801194f7ca3cffc3535 icedtea-2.3
-2783cace584cbfa3ed52774185859faf41569f8e icedtea-2.3.1
-a3fa5d49d528c32ad5d4b49e7241696a672ffe18 icedtea-2.3.2
-acba2d30209d19a87dbc0d2a6e366f09f01a210d icedtea-2.3.3
-301e79a966b4627af0113e30f65409baf9ebf1ce icedtea-2.3.4
-8bd8e70d4a032ea3d3642b247dddc0882850ebe0 icedtea-2.3.5
-02128561d696aaaa1a12b0ebfad2580cbbe04b87 icedtea-2.3.6
-02128561d696aaaa1a12b0ebfad2580cbbe04b87 icedtea-2.3.6
-0000000000000000000000000000000000000000 icedtea-2.3.6
+43775eae8df6c874fb3631c86009505cf3821b1f jdk7u6-b31
43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10
a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30
d7f2b3949f9c9ff1115ea61c496d3cd4c62e2759 jdk7u7-b11
@@ -228,6 +220,8 @@
dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02
3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04
d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05
+81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31
+d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32
d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10
5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11
48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12
@@ -238,8 +232,11 @@
494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17
dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18
b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30
+337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31
c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20
168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21
+7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32
+61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33
c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03
0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04
e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05
@@ -247,16 +244,63 @@
80a3d0bcd3d4c9e83b75416178bdd60a2d23ebbc jdk7u11-b07
e7c55def6796d3c426631b5717084ef122908847 jdk7u11-b08
2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u13-b09
-0000000000000000000000000000000000000000 icedtea-2.3.6
-0e569b50110e197ae20f7b8ef0a26e41f987fee6 icedtea-2.3.6
-dd8d1a8f222f0e93db652cd5127644ab737eef5d icedtea-2.3.7
-506161df1c48a9c9f7f0d8db7108a0b1ab83493b icedtea-2.3.8
3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10
527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30
3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20
+1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01
+d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02
+e7c504c99ab60e3b21cdc9460afaa3926d53cff1 jdk7u8-b03
+996e3145029120fd6ef2cacb3d03cb1f20862247 jdk7u8-b04
+891689cc39ff9d67bc4fe43bcb91ecdabda1f9f8 jdk7u8-b05
+f16343fe14acb4118f0a3f78fd735a4a6133c76a jdk7u10-b06
+1fa71ffbbd596086dbade86505d2d7e1c436de76 jdk7u10-b07
+e7014c55a9e55c10fe4f91ca092eb01029c36c75 jdk7u10-b08
+aaf495a24a9bb996b3955e52edff8d93ff62dc5f jdk7u10-b09
+3eddc50eb3574bf4cff4081310fd763e958ed073 jdk7u12-b01
+207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02
+a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03
+52945b197d7c93d215067034a45e5e9452c67f78 jdk7u12-b04
+eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05
+a008905ce525b88e5bdc80fe6ad7570f6f6a19ac jdk7u12-b06
+c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07
+1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08
+87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09
+8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint
+745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10
+2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11
+594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12
+ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13
+bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14
+b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15
0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01
0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02
25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30
+5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31
+e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33
f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03
2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32
0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01
+8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02
+933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30
+790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31
+527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01
+bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02
+20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03
+d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04
+2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05
+14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06
+0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07
+1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08
+a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09
+602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
+fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
+450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
+170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/.jcheck/conf new/icedtea7-forest-2-4-9c74cb4a3ae8/.jcheck/conf
--- old/icedtea7-forest-2-3-12b96a57263c/.jcheck/conf 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/.jcheck/conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/Makefile new/icedtea7-forest-2-4-9c74cb4a3ae8/Makefile
--- old/icedtea7-forest-2-3-12b96a57263c/Makefile 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/Makefile 2013-06-07 20:48:34.000000000 +0200
@@ -164,16 +164,23 @@
clobber:: deploy-clobber
endif
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+ generic_build_repo_series:: install-binaries-jdk-debug
+ clobber:: install-binaries-jdk-debug-clobber
+endif
+
generic_build_repo_series::
@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
# The debug build, fastdebug or debug. Needs special handling.
-# Note that debug builds do NOT do INSTALL steps, but must be done
-# after the product build and before the INSTALL step of the product build.
+#
+# Note that debug builds do NOT do INSTALL steps aside from the
+# install-binaries-jdk-debug or install-binaries-jdk-debug-clobber targets.
#
# DEBUG_NAME is fastdebug or debug
# ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
# The resulting image directory (j2sdk-image) is used by the install makefiles
+# (only if debug files are present when install checks for them)
# to create a debug install bundle jdk-*-debug-** bundle (tar or zip)
# which will install in the debug or fastdebug subdirectory of the
# normal product install area.
@@ -189,7 +196,7 @@
ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-
+
create_fresh_product_bootdir: FRC
$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
GENERATE_DOCS=false \
@@ -218,7 +225,7 @@
ifeq ($(DO_BOOT_CYCLE),true)
-
+
# Create the bootdir to use in the build
product_build:: create_fresh_product_bootdir
debug_build:: create_fresh_debug_bootdir
@@ -256,6 +263,8 @@
ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
+ BUILD_INSTALL_BUNDLES=true \
+ CREATE_DEBUGINFO_BUNDLES=false \
$(BOOT_CYCLE_DEBUG_SETTINGS) \
generic_build_repo_series
@@ -540,8 +549,8 @@
################################################################
.PHONY: all test test_run test_start test_summary test_clean \
- generic_build_repo_series \
- what clobber insane \
+ generic_build_repo_series \
+ what clobber insane \
dev dev-build dev-sanity dev-clobber \
product_build \
fastdebug_build \
@@ -556,4 +565,3 @@
# Force target
FRC:
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/get_source.sh new/icedtea7-forest-2-4-9c74cb4a3ae8/get_source.sh
--- old/icedtea7-forest-2-3-12b96a57263c/get_source.sh 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/get_source.sh 2013-06-07 20:48:34.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#
# Get clones of all nested repositories
-sh ./make/scripts/hgforest.sh clone
+sh ./make/scripts/hgforest.sh clone $*
# Update all existing repositories to the latest sources
sh ./make/scripts/hgforest.sh pull -u
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/deploy-rules.gmk new/icedtea7-forest-2-4-9c74cb4a3ae8/make/deploy-rules.gmk
--- old/icedtea7-forest-2-3-12b96a57263c/make/deploy-rules.gmk 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/deploy-rules.gmk 2013-06-07 20:48:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -42,20 +42,6 @@
endif
DEPLOY_BUILD_TARGETS = sanity deploy
-# Only build 7-Zip LZMA file compression if it is available
-# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), windows)
- EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
- $(ECHO) true ; \
- else \
- $(ECHO) false ; \
- fi )
- ifeq ($(EC_TMP), true)
- DEPLOY_BUILD_TARGETS += extra-comp-all
- endif
- endif
-endif
ifneq ($(JQS), off)
ifeq ($(ARCH_DATA_MODEL), 32)
@@ -65,22 +51,6 @@
endif
endif
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), windows)
- # Only set up to use UPX compression if it is available
- UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
- $(ECHO) true ; \
- else \
- $(ECHO) false ; \
- fi )
- ifeq ($(UP_TMP), true)
- DEPLOY_BUILD_TARGETS += cmd-comp-all
- endif
- endif
-endif
-
-
-
ifndef DEV_ONLY
DEPLOY_BUILD_TARGETS += images
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/install-rules.gmk new/icedtea7-forest-2-4-9c74cb4a3ae8/make/install-rules.gmk
--- old/icedtea7-forest-2-3-12b96a57263c/make/install-rules.gmk 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/install-rules.gmk 2013-06-07 20:48:34.000000000 +0200
@@ -97,6 +97,23 @@
@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
+
+install-binaries-jdk-debug:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+ @$(call MakeStart,install,binaries-jdk-debug)
+ ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+ $(MAKE) binaries-jdk-debug $(INSTALL_BUILD_ARGUMENTS))
+ @$(call MakeFinish,install,binaries-jdk-debug)
+endif
+
+install-binaries-jdk-debug-clobber:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+ @$(call MakeStart,install,binaries-jdk-debug-clobber)
+ ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+ $(MAKE) binaries-jdk-debug-clobber $(INSTALL_BUILD_ARGUMENTS))
+ @$(call MakeFinish,install,binaries-jdk-debug-clobber)
+endif
+
install-clobber:
ifeq ($(BUILD_INSTALL), true)
@$(call MakeStart,install,clobber)
@@ -116,4 +133,5 @@
######################################
.PHONY: install install-build install-clobber install-sanity \
- update-installer update-patchgen installer
+ update-installer update-patchgen installer \
+ install-binaries-jdk-debug install-binaries-jdk-debug-clobber
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/jprt.gmk new/icedtea7-forest-2-4-9c74cb4a3ae8/make/jprt.gmk
--- old/icedtea7-forest-2-3-12b96a57263c/make/jprt.gmk 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/jprt.gmk 2013-06-07 20:48:34.000000000 +0200
@@ -30,11 +30,9 @@
# To get all the bundles from JPRT, use:
# jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ...
-DEFAULT_BUILD_FLAVOR=product
-
# JPRT will define these when it builds
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
-JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
+JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
+JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-install-bundle.zip
ifeq ($(PLATFORM),windows)
ZIPFLAGS=-q
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/jprt.properties new/icedtea7-forest-2-4-9c74cb4a3ae8/make/jprt.properties
--- old/icedtea7-forest-2-3-12b96a57263c/make/jprt.properties 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/jprt.properties 2013-06-07 20:48:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -79,20 +79,17 @@
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_misc}
+ ${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
@@ -107,6 +104,7 @@
${jprt.my.test.target.set:TESTNAME=jdk_beans1} \
${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
${jprt.my.test.target.set:TESTNAME=jdk_swing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/scripts/hgforest.sh new/icedtea7-forest-2-4-9c74cb4a3ae8/make/scripts/hgforest.sh
--- old/icedtea7-forest-2-3-12b96a57263c/make/scripts/hgforest.sh 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/scripts/hgforest.sh 2013-06-07 20:48:34.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
#
# Shell script for a fast parallel forest command
+command="$1"
+pull_extra_base="$2"
tmp=/tmp/forest.$$
rm -f -r ${tmp}
@@ -35,40 +37,58 @@
# Only look in specific locations for possible forests (avoids long searches)
pull_default=""
-if [ "$1" = "clone" -o "$1" = "fclone" ] ; then
+repos=""
+repos_extra=""
+if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
subrepos="corba jaxp jaxws langtools jdk hotspot"
if [ -f .hg/hgrc ] ; then
pull_default=`hg paths default`
+ if [ "${pull_default}" = "" ] ; then
+ echo "ERROR: Need initial clone with 'hg paths default' defined"
+ exit 1
+ fi
fi
if [ "${pull_default}" = "" ] ; then
- echo "ERROR: Need initial clone with 'hg paths default' defined"
+ echo "ERROR: Need initial repository to use this script"
exit 1
fi
- repos=""
for i in ${subrepos} ; do
if [ ! -f ${i}/.hg/hgrc ] ; then
repos="${repos} ${i}"
fi
done
+ if [ "${pull_extra_base}" != "" ] ; then
+ subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
+ pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
+ pull_extra="${pull_extra_base}/${pull_default_tail}"
+ for i in ${subrepos_extra} ; do
+ if [ ! -f ${i}/.hg/hgrc ] ; then
+ repos_extra="${repos_extra} ${i}"
+ fi
+ done
+ fi
at_a_time=2
+ # Any repos to deal with?
+ if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then
+ echo "No repositories to clone."
+ exit
+ fi
else
hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null`
# Derive repository names from the .hg directory locations
- repos=""
for i in ${hgdirs} ; do
repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`"
done
at_a_time=8
+ # Any repos to deal with?
+ if [ "${repos}" = "" ] ; then
+ echo "No repositories to process."
+ exit
+ fi
fi
-# Any repos to deal with?
-if [ "${repos}" = "" ] ; then
- echo "No repositories to process."
- exit
-fi
-
-# Echo out what repositories we will process
-echo "# Repos: ${repos}"
+# Echo out what repositories we will clone
+echo "# Repos: ${repos} ${repos_extra}"
# Run the supplied command on all repos in parallel, save output until end
n=0
@@ -77,8 +97,9 @@
n=`expr ${n} '+' 1`
(
(
- if [ "$1" = "clone" -o "$1" = "fclone" ] ; then
- cline="hg $* ${pull_default}/${i} ${i}"
+ if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
+ pull_newrepo="`echo ${pull_default}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
+ cline="hg clone ${pull_newrepo} ${i}"
echo "# ${cline}"
( eval "${cline}" )
else
@@ -92,10 +113,29 @@
sleep 5
fi
done
-
# Wait for all hg commands to complete
wait
+if [ "${repos_extra}" != "" ] ; then
+ for i in ${repos_extra} ; do
+ echo "Starting on ${i}"
+ n=`expr ${n} '+' 1`
+ (
+ (
+ pull_newextrarepo="`echo ${pull_extra}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
+ cline="hg clone ${pull_newextrarepo} ${i}"
+ echo "# ${cline}"
+ ( eval "${cline}" )
+ echo "# exit code $?"
+ ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) &
+ if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
+ sleep 5
+ fi
+ done
+ # Wait for all hg commands to complete
+ wait
+fi
+
# Cleanup
rm -f -r ${tmp}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/scripts/normalizer.pl new/icedtea7-forest-2-4-9c74cb4a3ae8/make/scripts/normalizer.pl
--- old/icedtea7-forest-2-3-12b96a57263c/make/scripts/normalizer.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/scripts/normalizer.pl 2013-06-07 20:48:34.000000000 +0200
@@ -0,0 +1,208 @@
+#!/usr/bin/perl
+
+#
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Parses java files:
+# 1. Removes from the end of lines spaces and TABs
+# 2. Replaces TABs by spaces
+# 3. Replaces all NewLine separators by Unix NewLine separators
+# 4. Makes one and only one empty line at the end of each file
+
+if ($#ARGV < 0) {
+ &usage;
+
+ die;
+}
+
+use Cwd 'abs_path';
+
+my @extensions = ("java");
+
+# Read options
+my $dirpos = 0;
+
+while ($dirpos < $#ARGV) {
+ if ($ARGV[$dirpos] eq "-e") {
+ @extensions = split(/,/, $ARGV[$dirpos + 1]);
+ } else {
+ last;
+ }
+
+ $dirpos += 2;
+}
+
+if ($dirpos > $#ARGV) {
+ &usage;
+
+ die;
+}
+
+use Cwd;
+my $currdir = getcwd;
+
+my $allfiles = 0;
+
+my $filecount = 0;
+
+my @tabvalues;
+
+# Init tabvalues
+push (@tabvalues, " ");
+
+for (my $i = 1; $i < 8; $i++) {
+ push(@tabvalues, $tabvalues[$i - 1] . " ");
+}
+
+open(FILELIST, ">$currdir/filelist") or die "Failed while open $currdir/filelist: $!\n";
+
+while ($dirpos <= $#ARGV) {
+ use File::Find;
+
+ find(\&parse_file, abs_path($ARGV[$dirpos]));
+
+ $dirpos += 1;
+}
+
+close(FILELIST);
+
+use Cwd 'chdir';
+chdir $currdir;
+
+print "Checked $allfiles file(s)\n";
+print "Modified $filecount file(s)\n";
+print "See results in the file $currdir/filelist\n";
+
+sub parse_file {
+ my $filename = $File::Find::name;
+
+ # Skip directories
+ return if -d;
+
+ # Skip SCCS files
+ return if ($filename =~ /\/SCCS\//);
+
+ # Skip files with invalid extensions
+ my $accepted = 0;
+ foreach my $ext (@extensions) {
+ if ($_ =~ /\.$ext$/i) {
+ $accepted = 1;
+
+ last;
+ }
+ }
+ return if ($accepted == 0);
+
+ use File::Basename;
+ my $dirname = dirname($filename);
+
+ use Cwd 'chdir';
+ chdir $dirname;
+
+ open(FILE, $filename) or die "Failed while open $filename: $!\n";
+
+ # Read file
+ my @content;
+ my $line;
+ my $emptylinescount = 0;
+ my $modified = 0;
+
+ while ($line = <FILE>) {
+ my $originalline = $line;
+
+ # Process line
+
+ # Remove from the end of the line spaces and return character
+ while ($line =~ /\s$/) {
+ chop($line);
+ }
+
+ # Replace TABs
+ for (my $i = 0; $i < length($line); $i++) {
+ if (substr($line, $i, 1) =~ /\t/) {
+ $line = substr($line, 0, $i) . $tabvalues[7 - ($i % 8)] . substr($line, $i + 1);
+ }
+ }
+
+ if (length($line) == 0) {
+ $emptylinescount++;
+ } else {
+ while ($emptylinescount > 0) {
+ push(@content, "");
+
+ $emptylinescount--;
+ }
+
+ push(@content, $line);
+ }
+
+ if ($originalline ne ($line . "\n")) {
+ $modified = 1;
+ }
+
+ }
+
+ $allfiles++;
+
+ if ($emptylinescount > 0) {
+ $modified = 1;
+ }
+
+ close(FILE);
+
+ if ($modified != 0) {
+ # Write file
+ open(FILE, ">$filename") or die "Failed while open $filename: $!\n";
+
+ for (my $i = 0; $i <= $#content; $i++) {
+ print FILE "$content[$i]\n";
+ }
+
+ close(FILE);
+
+ # Print name from current dir
+ if (index($filename, $currdir) == 0) {
+ print FILELIST substr($filename, length($currdir) + 1);
+ } else {
+ print FILELIST $filename;
+ }
+ print FILELIST "\n";
+
+ $filecount++;
+
+ print "$filename: modified\n";
+ }
+}
+
+sub usage {
+ print "Usage:\n";
+ print " normalizer.pl [-options] <dir> [dir2 dir3 ...]\n";
+ print " Available options:\n";
+ print " -e comma separated files extensions. By default accepts only java files\n";
+ print "\n";
+ print "Examples:\n";
+ print " normalizer.pl -e c,cpp,h,hpp .\n";
+}
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/make/scripts/webrev.ksh new/icedtea7-forest-2-4-9c74cb4a3ae8/make/scripts/webrev.ksh
--- old/icedtea7-forest-2-3-12b96a57263c/make/scripts/webrev.ksh 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/make/scripts/webrev.ksh 2013-06-07 20:48:34.000000000 +0200
@@ -19,7 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# This script takes a file list and a workspace and builds a set of html files
@@ -27,7 +27,7 @@
# Documentation is available via 'webrev -h'.
#
-WEBREV_UPDATED=23.18-hg
+WEBREV_UPDATED=23.18-hg+jbs
HTML='<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -146,7 +146,7 @@
#
bug2url()
{
- sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL'&\">&</a>|g'
+ sed -e 's|[0-9]\{5,\}|&</a>|g'
}
#
@@ -230,8 +230,8 @@
# $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \
# new/usr/src/tools/scripts/webrev.sh \
# webrev.sh usr/src/tools/scripts \
-# '<a href="http://monaco.sfbay.sun.com/detail.jsp?cr=1234567">
-# 1234567</a> my bugid' > <file>.html
+# '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567">
+# JDK-1234567</a> my bugid' > <file>.html
#
# framed_sdiff() is then called which creates $2.frames.html
# in the webrev tree.
@@ -1160,7 +1160,7 @@
print "$comm"
return
fi
-
+
print "$comm" | html_quote | bug2url | sac2url
)
fi
@@ -1418,7 +1418,7 @@
next;}
END {for (tree in trees)
{ rev=revs[trees[tree]];
- if (rev > 0)
+ if (rev > 0)
{printf("%s %d\n",trees[tree],rev-1)}
}}' | while read LINE
do
@@ -1459,7 +1459,7 @@
{
TREE=$1
HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT"
-
+
$HGCMD -mdn 2>/dev/null | $FILTER | while read F
do
echo $TREE/$F
@@ -1543,7 +1543,7 @@
if (n == 0)
{ printf("A %s/%s\n",tree,$2)}
else
- { printf("A %s\n",$2)};
+ { printf("A %s\n",$2)};
next}
/^ / {n=index($1,tree);
if (n == 0)
@@ -1604,7 +1604,7 @@
# We need at least one of default-push or default paths set in .hg/hgrc
# If neither are set we don't know who to compare with.
-function flist_from_mercurial
+function flist_from_mercurial
{
# if [ "${PWS##ssh://}" != "$PWS" -o \
# "${PWS##http://}" != "$PWS" -o \
@@ -1757,7 +1757,7 @@
elif [[ "$OS" == "Linux" ]]; then
DEVTOOLS="/java/devtools/linux/bin"
fi
-
+
ppath=$PATH
ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin
ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin
@@ -1844,7 +1844,7 @@
ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'`
ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'`
fi
-
+
}
function build_old_new_mercurial
@@ -2096,7 +2096,7 @@
PARENT_REV=$OPTARG;;
v) print "$0 version: $WEBREV_UPDATED";;
-
+
?) usage;;
esac
@@ -2338,7 +2338,7 @@
#
[[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS
[[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name`
-
+
if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then
print -u2 "$codemgr_ws: no such workspace"
exit 1
@@ -2521,10 +2521,16 @@
# Bug IDs will be replaced by a URL. Order of precedence
# is: default location, $WEBREV_BUGURL, the -O flag.
#
-BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr='
+BUGURL='https://jbs.oracle.com/bugs/browse/'
[[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
-[[ -n "$Oflag" ]] && \
+if [[ -n "$Oflag" ]]; then
+ CRID=`echo $CRID | sed -e 's/JDK-//'`
BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id='
+ IDPREFIX=''
+else
+ IDPREFIX='JDK-'
+fi
+
#
# Likewise, ARC cases will be replaced by a URL. Order of precedence
@@ -2561,7 +2567,7 @@
#
# Should we ignore changes in white spaces when generating diffs?
-#
+#
if [[ -n $bflag ]]; then
DIFFOPTS="-t"
else
@@ -2748,7 +2754,7 @@
fi
fi
else
-
+
#
# If we have old and new versions of the file then run the
# appropriate diffs. This is complicated by a couple of factors:
@@ -3000,22 +3006,31 @@
# external URL has a <title> like:
# <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title>
# while internal URL has <title> like:
-# <title>6641309: Wrong Cookie separator used in HttpURLConnection</title>
+# <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title>
#
if [[ -n $CRID ]]; then
for id in $CRID
do
+ if [[ -z "$Oflag" ]]; then
+ #add "JDK-" to raw bug id for jbs links.
+ id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
+ fi
print "<tr><th>Bug id:</th><td>"
url="${BUGURL}${id}"
+ if [[ -n "$Oflag" ]]; then
+ cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/'
+ else
+ cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
+ fi
if [[ -n $WGET ]]; then
- msg=`$WGET -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed 's/Bug ID://'`
+ msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote`
fi
- if [[ -n $msg ]]; then
- print "$msg</a>"
- else
- print $id | bug2url
+ if [[ -z $msg ]]; then
+ msg="${id}"
fi
-
+
+ print "$msg</a>"
+
print "</td></tr>"
done
fi
@@ -3179,4 +3194,3 @@
print "Done."
print "Output to: $WDIR"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-3-12b96a57263c/test/Makefile new/icedtea7-forest-2-4-9c74cb4a3ae8/test/Makefile
--- old/icedtea7-forest-2-3-12b96a57263c/test/Makefile 2013-03-08 17:04:19.000000000 +0100
+++ new/icedtea7-forest-2-4-9c74cb4a3ae8/test/Makefile 2013-06-07 20:48:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -57,15 +57,17 @@
jdk_beans1 jdk_beans2 jdk_beans3 \
jdk_io \
jdk_lang \
- jdk_management1 jdk_management2 \
+ jdk_management \
+ jdk_jmx \
jdk_math \
- jdk_misc \
+ jdk_other \
jdk_net \
- jdk_nio1 jdk_nio2 jdk_nio3 \
+ jdk_nio \
jdk_security1 jdk_security2 jdk_security3 \
jdk_sound \
jdk_text \
- jdk_tools1 jdk_tools2 \
+ jdk_tools \
+ jdk_jdi \
jdk_jfr \
jdk_util
++++++ 12b96a57263c.tar.gz -> 9d2007a13c02.tar.gz ++++++
++++ 494432 lines of diff (skipped)
++++++ 12b96a57263c.tar.gz -> c67fd7874b1a.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/12b96a57263c.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/c67fd7874b1a.tar.gz differ: char 5, line 1
++++++ 12b96a57263c.tar.gz -> ffb1b6bc4750.tar.gz ++++++
++++ 427714 lines of diff (skipped)
++++++ icedtea-2.3.9.tar.gz -> icedtea-2.4.0.tar.gz ++++++
++++ 55078 lines of diff (skipped)
++++++ jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz -> jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz ++++++
++++ 6125 lines of diff (skipped)
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
--- /var/tmp/diff_new_pack.y3N1Oa/_old 2013-07-02 12:25:00.000000000 +0200
+++ /var/tmp/diff_new_pack.y3N1Oa/_new 2013-07-02 12:25:00.000000000 +0200
@@ -1,28 +1,28 @@
-Index: openjdk/jdk/src/share/lib/security/java.security
+Index: openjdk/jdk/src/share/lib/security/java.security-linux
===================================================================
---- openjdk/jdk/src/share/lib/security/java.security.orig
-+++ openjdk/jdk/src/share/lib/security/java.security
-@@ -147,7 +147,10 @@ package.access=sun.,\
- com.sun.org.apache.xml.internal.res.,\
+--- openjdk/jdk/src/share/lib/security/java.security-linux.orig
++++ openjdk/jdk/src/share/lib/security/java.security-linux
+@@ -151,7 +151,10 @@ package.access=sun.,\
com.sun.org.apache.xml.internal.serializer.utils.,\
com.sun.org.apache.xml.internal.utils.,\
-- com.sun.org.glassfish.
-+ com.sun.org.glassfish.,\
+ com.sun.org.glassfish.,\
+- oracle.jrockit.jfr.
+ com.sun.org.glassfish.gmbal.,\
++ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
-
#
# List of comma-separated packages that start with or equal this string
-@@ -182,7 +185,10 @@ package.definition=sun.,\
- com.sun.org.apache.xml.internal.res.,\
+ # will cause a security exception to be thrown when
+@@ -186,7 +189,10 @@ package.definition=sun.,\
com.sun.org.apache.xml.internal.serializer.utils.,\
com.sun.org.apache.xml.internal.utils.,\
-- com.sun.org.glassfish.
-+ com.sun.org.glassfish.,\
-+ com.sun.org.glassfish.gmbal.,\
+ com.sun.org.glassfish.,\
+- oracle.jrockit.jfr.
++ com.sun.org.glassfish.gmbl.,\
++ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
-
#
# Determines whether this properties file can be appended to
+ # or overridden on the command line via -Djava.security.properties
++++++ java-1.7.0-openjdk-size_t.patch ++++++
--- /var/tmp/diff_new_pack.y3N1Oa/_old 2013-07-02 12:25:00.000000000 +0200
+++ /var/tmp/diff_new_pack.y3N1Oa/_new 2013-07-02 12:25:00.000000000 +0200
@@ -1,6 +1,7 @@
-diff -up openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.sav openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp 2012-03-09 14:48:08.223867826 -0500
+Index: openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.orig
++++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
@@ -572,15 +572,15 @@ void MethodLiveness::print_times() {
@@ -31,10 +32,11 @@
_analyzer->bit_map_size_bits());
answer.set_is_valid();
-diff -up openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2012-03-09 14:48:08.223867826 -0500
-@@ -2656,7 +2656,7 @@ void CFLS_LAB::get_from_global_pool(size
+Index: openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.orig
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+@@ -2677,7 +2677,7 @@ void CFLS_LAB::get_from_global_pool(size
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
@@ -43,37 +45,11 @@
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
-diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-03-09 16:30:30.426921691 -0500
-@@ -481,7 +481,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
- _regionStack(),
- // _finger set in set_non_marking_state
-
-- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
-+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
- // _active_tasks set in set_non_marking_state
- // _tasks set inside the constructor
- _task_queues(new CMTaskQueueSet((int) _max_task_num)),
-@@ -586,7 +586,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
- _sleep_factor = sleep_factor;
- _marking_task_overhead = marking_task_overhead;
- } else {
-- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
-+ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
- _sleep_factor = 0.0;
- _marking_task_overhead = 1.0;
- }
-@@ -1116,7 +1116,7 @@ void ConcurrentMark::markFromRoots() {
-
- _restart_for_overflow = false;
-
-- size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
-+ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
- force_overflow_conc()->init();
- set_phase(active_workers, true /* concurrent */);
-
-@@ -3689,7 +3689,7 @@ void CMTask::drain_local_queue(bool part
+Index: openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+@@ -3586,7 +3586,7 @@ void CMTask::drain_local_queue(bool part
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -82,19 +58,20 @@
} else {
target_size = 0;
}
-@@ -4604,7 +4604,7 @@ size_t G1PrintRegionLivenessInfoClosure:
+@@ -4366,7 +4366,7 @@ size_t G1PrintRegionLivenessInfoClosure:
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
-- bytes = MIN2((size_t) HeapRegion::GrainBytes, *hum_bytes);
-+ bytes = MIN2((size_t) HeapRegion::GrainBytes, (size_t)*hum_bytes);
+- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
++ bytes = MIN2((size_t)HeapRegion::GrainBytes, (size_t)*hum_bytes);
*hum_bytes -= bytes;
}
return bytes;
-diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2012-03-09 14:48:08.226867784 -0500
-@@ -1615,7 +1615,7 @@ HeapWord* G1CollectedHeap::expand_and_al
+Index: openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+@@ -1729,7 +1729,7 @@ HeapWord* G1CollectedHeap::expand_and_al
verify_region_sets_optional();
@@ -103,10 +80,11 @@
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
-diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-03-09 14:48:08.226867784 -0500
-@@ -1083,7 +1083,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
+Index: openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+@@ -840,7 +840,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
// This can be done by either mutator threads together with the
// concurrent refinement threads or GC threads.
int HeapRegionRemSet::num_par_rem_sets() {
@@ -115,10 +93,11 @@
}
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
-diff -up openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2012-03-09 14:48:08.226867784 -0500
-@@ -62,7 +62,7 @@ ParMarkBitMap::initialize(MemRegion cove
+Index: openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.orig
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
+@@ -69,7 +69,7 @@ ParMarkBitMap::initialize(MemRegion cove
if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
_region_start = covered_region.start();
_region_size = covered_region.word_size();
@@ -127,10 +106,11 @@
_beg_bits.set_map(map);
_beg_bits.set_size(bits / 2);
_end_bits.set_map(map + words / 2);
-diff -up openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2012-03-09 14:48:08.227867766 -0500
-@@ -188,7 +188,7 @@ bool ParScanThreadState::take_from_overf
+Index: openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.orig
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+@@ -198,7 +198,7 @@ bool ParScanThreadState::take_from_overf
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,
@@ -139,10 +119,11 @@
num_overflow_elems);
// Transfer the most recent num_take_elems from the overflow
// stack to our work queue.
-diff -up openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.sav openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
---- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2012-03-09 14:48:08.227867766 -0500
-@@ -354,7 +354,7 @@ void GenCollectorPolicy::initialize_size
+Index: openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.orig
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -357,7 +357,7 @@ void GenCollectorPolicy::initialize_size
// generally small compared to the NewRatio calculation.
_min_gen0_size = NewSize;
desired_new_size = NewSize;
@@ -151,7 +132,7 @@
} else {
// For the case where NewSize is the default, use NewRatio
// to size the minimum and initial generation sizes.
-@@ -362,10 +362,10 @@ void GenCollectorPolicy::initialize_size
+@@ -365,10 +365,10 @@ void GenCollectorPolicy::initialize_size
// NewRatio is overly large, the resulting sizes can be too
// small.
_min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
@@ -164,7 +145,7 @@
}
assert(_min_gen0_size > 0, "Sanity check");
-@@ -420,14 +420,14 @@ bool TwoGenerationCollectorPolicy::adjus
+@@ -423,14 +423,14 @@ bool TwoGenerationCollectorPolicy::adjus
// Adjust gen0 down to accomodate OldSize
*gen0_size_ptr = heap_size - min_gen0_size;
*gen0_size_ptr =
@@ -181,7 +162,7 @@
min_alignment());
}
}
-@@ -451,7 +451,7 @@ void TwoGenerationCollectorPolicy::initi
+@@ -454,7 +454,7 @@ void TwoGenerationCollectorPolicy::initi
// for setting the gen1 maximum.
_max_gen1_size = max_heap_byte_size() - _max_gen0_size;
_max_gen1_size =
@@ -190,7 +171,7 @@
min_alignment());
// If no explicit command line flag has been set for the
// gen1 size, use what is left for gen1.
-@@ -465,11 +465,11 @@ void TwoGenerationCollectorPolicy::initi
+@@ -468,11 +468,11 @@ void TwoGenerationCollectorPolicy::initi
"gen0 has an unexpected minimum size");
set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
set_min_gen1_size(
@@ -204,9 +185,10 @@
min_alignment()));
} else {
-diff -up openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.sav openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2012-03-09 14:48:08.227867766 -0500
+Index: openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.orig
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
@@ -46,7 +46,7 @@ void objArrayKlass::objarray_follow_cont
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
@@ -225,10 +207,11 @@
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
-diff -up openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav 2012-02-14 16:11:12.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2012-03-09 14:48:08.228867748 -0500
-@@ -1179,7 +1179,7 @@ void Arguments::set_cms_and_parnew_gc_fl
+Index: openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.orig
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1224,7 +1224,7 @@ void Arguments::set_cms_and_parnew_gc_fl
// so it's NewRatio x of NewSize.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
++++++ java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch ++++++
--- /var/tmp/diff_new_pack.y3N1Oa/_old 2013-07-02 12:25:00.000000000 +0200
+++ /var/tmp/diff_new_pack.y3N1Oa/_new 2013-07-02 12:25:00.000000000 +0200
@@ -1,31 +1,3 @@
---- openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
-@@ -2742,7 +2742,7 @@
- out_16x2(codebuf, T_DMB(0xe));
- }
-
--int tbh(CodeBuf *codebuf, Reg base, Reg idx)
-+void tbh(CodeBuf *codebuf, Reg base, Reg idx)
- {
- out_16x2(codebuf, T_TBH(base, idx));
- }
-@@ -3113,7 +3113,7 @@
- J_Unimplemented();
- }
-
--int chka(CodeBuf *codebuf, u32 size, u32 idx)
-+void chka(CodeBuf *codebuf, u32 size, u32 idx)
- {
- cmp_reg(codebuf, idx, size);
- it(codebuf, COND_CS, IT_MASK_T);
-@@ -3437,6 +3437,7 @@
- if ((mask & (1<