[java-1.7.0-openjdk/f17] - Used newly prepared tarball with security fixes - Bump to icedtea7-forest-2.2.1 - _mandir/man1/jcm
jiri vanek
jvanek at fedoraproject.org
Wed Jun 13 11:21:28 UTC 2012
commit 310829aa8b1b8086dfdc32c32f05c488b7b6a3f8
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Wed Jun 13 13:21:53 2012 +0200
- Used newly prepared tarball with security fixes
- Bump to icedtea7-forest-2.2.1
- _mandir/man1/jcmd-name.1 added to alternatives
- Updated rhino.patch
- Modified partially upstreamed patch302 - systemtap.patch
- Temporarly disabled patch102 - java-1.7.0-openjdk-size_t.patch
- Removed already upstreamed patches 104,107,108,301
- java-1.7.0-openjdk-arm-ftbfs.patch
- java-1.7.0-openjdk-system-zlib.patch
- java-1.7.0-openjdk-remove-mimpure-opt.patch
- systemtap-alloc-size-workaround.patch
- patch 105 (java-1.7.0-openjdk-ppc-zero-jdk.patch) have become 104
- patch 106 (java-1.7.0-openjdk-ppc-zero-hotspot.patch) have become 105
java-1.7.0-openjdk-arm-ftbfs.patch | 220 --------------------
...1.7.0-openjdk-java-access-bridge-security.patch | 19 ++-
java-1.7.0-openjdk-remove-mimpure-opt.patch | 150 -------------
java-1.7.0-openjdk-system-zlib.patch | 12 -
java-1.7.0-openjdk.spec | 173 ++++++++--------
rhino.patch | 6 +-
sources | 4 +-
systemtap-alloc-size-workaround.patch | 12 -
systemtap.patch | 100 ++++------
9 files changed, 141 insertions(+), 555 deletions(-)
---
diff --git a/java-1.7.0-openjdk-java-access-bridge-security.patch b/java-1.7.0-openjdk-java-access-bridge-security.patch
index 784a359..3f202aa 100644
--- a/java-1.7.0-openjdk-java-access-bridge-security.patch
+++ b/java-1.7.0-openjdk-java-access-bridge-security.patch
@@ -1,11 +1,20 @@
---- jsorig 2008-12-05 11:43:39.000000000 -0500
-+++ openjdk/jdk/src/share/lib/security/java.security 2008-12-05 11:43:45.000000000 -0500
-@@ -127,7 +127,7 @@
+--- openjdk/jdk/src/share/lib/security/java.security-src
++++ openjdk/jdk/src/share/lib/security/java.security
+@@ -131,7 +131,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
--package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
+@@ -143,7 +143,7 @@
+ # by default, none of the class loaders supplied with the JDK call
+ # checkPackageDefinition.
+ #
+-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
++package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+
+ #
+ # Determines whether this properties file can be appended to
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 9bfd294..04028b0 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -9,8 +9,8 @@
# If runtests is 0 test suites will not be run.
%global runtests 0
-%global icedtea_version 2.1
-%global hg_tag icedtea-{icedtea_version}-branchpoint
+%global icedtea_version 2.2.1
+%global hg_tag icedtea-{icedtea_version}
%global accessmajorver 1.23
%global accessminorver 0
@@ -169,16 +169,20 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
URL: http://openjdk.java.net/
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/ openjdk -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/corba/ openjdk/corba -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/hotspot/ openjdk/hotspot -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/jaxp/ openjdk/jaxp -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/jaxws/ openjdk/jaxws -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/jdk/ openjdk/jdk -r %{hg_tag}
-# hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/langtools/ openjdk/langtools -r %{hg_tag}
+#head
+#REPO=http://icedtea.classpath.org/hg/icedtea7-forest
+#current release
+#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2
+# hg clone $REPO/ openjdk -r %{hg_tag}
+# hg clone $REPO/corba/ openjdk/corba -r %{hg_tag}
+# hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag}
+# hg clone $REPO/jaxp/ openjdk/jaxp -r %{hg_tag}
+# hg clone $REPO/jaxws/ openjdk/jaxws -r %{hg_tag}
+# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag}
+# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag}
# find openjdk -name ".hg" -exec rm -rf '{}' \;
# find openjdk -name ".hgtags" -exec rm -rf '{}' \;
-# tar czf openjdk-%{icedtea_version}.tar.gz openjdk
+# tar czf openjdk-icedtea-%{icedtea_version}.tar.gz openjdk
Source0: openjdk-icedtea-%{icedtea_version}.tar.gz
# Gnome access bridge
@@ -254,17 +258,10 @@ Patch102: %{name}-size_t.patch
# Patches for Arm
Patch103: %{name}-arm-fixes.patch
-Patch104: %{name}-arm-ftbfs.patch
# Patch for PPC/PPC64
-Patch105: %{name}-ppc-zero-jdk.patch
-Patch106: %{name}-ppc-zero-hotspot.patch
-
-# Fix bug in jdk_generic_profile.sh
-Patch107: %{name}-system-zlib.patch
-
-# Remove option no longer accepted by GCC
-Patch108: %{name}-remove-mimpure-opt.patch
+Patch104: %{name}-ppc-zero-jdk.patch
+Patch105: %{name}-ppc-zero-hotspot.patch
#
# Bootstrap patches (code with this is never shipped)
@@ -391,7 +388,6 @@ Patch300: pulse-soundproperties.patch
# SystemTap support
# Workaround for RH613824
-Patch301: systemtap-alloc-size-workaround.patch
Patch302: systemtap.patch
BuildRequires: autoconf
@@ -473,32 +469,25 @@ Requires(post): %{_sbindir}/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: jre7-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+Provides: jre7-%{origin} = %{epoch}:%{version}-%{release}
+Provides: jre7-%{javaver} = %{epoch}:%{version}-%{release}
+Provides: java7-%{javaver} = %{epoch}:%{version}-%{release}
+Provides: jre7 = %{javaver}
+Provides: java7-%{origin} = %{epoch}:%{version}-%{release}
+Provides: java7 = %{epoch}:%{javaver}
# Standard JPackage extensions provides.
-Provides: jndi = %{epoch}:%{version}
-Provides: jndi-ldap = %{epoch}:%{version}
-Provides: jndi-cos = %{epoch}:%{version}
-Provides: jndi-rmi = %{epoch}:%{version}
-Provides: jndi-dns = %{epoch}:%{version}
-Provides: jaas = %{epoch}:%{version}
-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
+Provides: jndi7 = %{epoch}:%{version}
+Provides: jndi7-ldap = %{epoch}:%{version}
+Provides: jndi7-cos = %{epoch}:%{version}
+Provides: jndi7-rmi = %{epoch}:%{version}
+Provides: jndi7-dns = %{epoch}:%{version}
+Provides: jaas7 = %{epoch}:%{version}
+Provides: jsse7 = %{epoch}:%{version}
+Provides: jce7 = %{epoch}:%{version}
+Provides: jdbc7-stdext = 4.1
+Provides: java7-sasl = %{epoch}:%{version}
+Provides: java7-fonts = %{epoch}:%{version}
%description
The OpenJDK runtime environment.
@@ -515,13 +504,13 @@ Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
# Standard JPackage devel provides.
-Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
-Provides: java-sdk-%{javaver} = %{epoch}:%{version}
-Provides: java-sdk-%{origin} = %{epoch}:%{version}
-Provides: java-sdk = %{epoch}:%{javaver}
-Provides: java-%{javaver}-devel = %{epoch}:%{version}
-Provides: java-devel-%{origin} = %{epoch}:%{version}
-Provides: java-devel = %{epoch}:%{javaver}
+Provides: java7-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
+Provides: java7-sdk-%{javaver} = %{epoch}:%{version}
+Provides: java7-sdk-%{origin} = %{epoch}:%{version}
+Provides: java7-sdk = %{epoch}:%{javaver}
+Provides: java7-%{javaver}-devel = %{epoch}:%{version}
+Provides: java7-devel-%{origin} = %{epoch}:%{version}
+Provides: java7-devel = %{epoch}:%{javaver}
%description devel
@@ -557,8 +546,8 @@ Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
# Standard JPackage javadoc provides.
-Provides: java-javadoc = %{epoch}:%{version}-%{release}
-Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
+Provides: java7-javadoc = %{epoch}:%{version}-%{release}
+Provides: java7-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
%description javadoc
The OpenJDK API documentation.
@@ -580,7 +569,6 @@ cp %{SOURCE4} .
# Add systemtap patches if enabled
%if %{with_systemtap}
-%patch301
%patch302
%endif
@@ -688,24 +676,23 @@ patch -l -p0 < %{PATCH5}
patch -l -p0 < %{PATCH6}
%endif
-# Type fixes
+# Type fixes for s390
+%ifarch s390 s390x
patch -l -p0 < %{PATCH101}
-patch -l -p0 < %{PATCH102}
+#patch -l -p0 < %{PATCH102} # size_t patch disabled for now as it has conflicts
+%endif
# Arm fixes
+%ifarch %{arm}
patch -l -p0 < %{PATCH103}
-patch -l -p0 < %{PATCH104}
+%endif
%ifarch ppc ppc64
# PPC fixes
+patch -l -p0 < %{PATCH104}
patch -l -p0 < %{PATCH105}
-patch -l -p0 < %{PATCH106}
%endif
-# Misc. fixes
-patch -l -p0 < %{PATCH107}
-patch -l -p0 < %{PATCH108}
-
# Add a "-icedtea" tag to the version
sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)-icedtea#" openjdk/jdk/make/common/shared/Defs.gmk
@@ -904,6 +891,7 @@ pushd java-access-bridge-%{accessver}
make
export PATH=$OLD_PATH
cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
+ chmod 644 gnome-java-bridge.jar
cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
popd
@@ -1354,6 +1342,7 @@ exit 0
%{_mandir}/man1/javah-%{name}.1*
%{_mandir}/man1/javap-%{name}.1*
%{_mandir}/man1/jconsole-%{name}.1*
+%{_mandir}/man1/jcmd-%{name}.1*
%{_mandir}/man1/jdb-%{name}.1*
%{_mandir}/man1/jhat-%{name}.1*
%{_mandir}/man1/jinfo-%{name}.1*
@@ -1397,40 +1386,48 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
-* Fri May 25 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.7
+* Mon Jun 11 2012 jiri Vanek <jvanek at redhat.com> - 1.7.0.3-2.2.1fc16.7
+- Used newly prepared tarball with security fixes
+- Bump to icedtea7-forest-2.2.1
+- _mandir/man1/jcmd-name.1 added to alternatives
+- Updated rhino.patch
+- Modified partially upstreamed patch302 - systemtap.patch
+- Temporarly disabled patch102 - java-1.7.0-openjdk-size_t.patch
+- Removed already upstreamed patches 104,107,108,301
+ - java-1.7.0-openjdk-arm-ftbfs.patch
+ - java-1.7.0-openjdk-system-zlib.patch
+ - java-1.7.0-openjdk-remove-mimpure-opt.patch
+ - systemtap-alloc-size-workaround.patch
+- patch 105 (java-1.7.0-openjdk-ppc-zero-jdk.patch) have become 104
+- patch 106 (java-1.7.0-openjdk-ppc-zero-hotspot.patch) have become 105
+
+
+- Added build requires zip, which was untill now dependence of dependence
+- Access gnome brridge jar forced to be 644
+
+* Fri May 25 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.6
- Miscellaneous fixes brought in from RHEL branch
- Resolves: rhbz#825255: Added ALT_STRIP_POLICY so that debug info is not stripped
+- Moved Patch #7 (usage of system zlib) to #107
-* Tue May 01 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.6
+* Tue May 01 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.5
- Removed VisualVM requirements
-- Obsoleted java-1.6.0-openjdk*
-- Added BR for zip
-* Mon Mar 26 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.5
-- Added SystemTap fixes by Mark Wielaard
+* Mon Mar 26 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.4
+- Merged with F17 branch
-* Sat Mar 24 2012 Dan Horák <dan[at]danny.cz>> - 1.7.0.3-2.1.fc17.4
-- update paths in the ppc patches, add missing snippet
+* Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.3
+- Reverted fix for rh740762
-* Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.3
-- Reverted fix for rhbz#740762
-- Fixed PPC/PPC64 build (rh804136) -- added patches from Chris Phillips
-- Moved OpenJDK specific patches to 1XX series
+* Mon Mar 12 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.2
+- Resolved rh740762: java.library.path is missing some paths
-* Mon Mar 12 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.2
-- Resolved rhbz#740762: java.library.path is missing some paths
-- Unified spec file for x86, x86_64, ARM and s390
- - Integrated changes from Dan Horák <dhorak at redhat.com> for Zero/s390
- - Integrated changes from Chris Phillips <chphilli at redhat.com> for Zero/ARM
-
-* Fri Feb 24 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.1
-- Added flag so that debuginfo is built into classfiles (rhbz# 796400)
+* Fri Feb 24 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.1
+- Added flag so that debuginfo is built into classfiles (rhbz# 796400)
- Updated rhino.patch to build scripting support (rhbz# 796398)
* Tue Feb 14 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1
- Updated to OpenJDK7u3/IcedTea7 2.1
-- Removed upstreamed glibc nameclash patch
-- Added patch to remove the -mimpure option to gcc
- Security fixes:
- S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
- S7082299, CVE-2011-3571: AtomicReferenceArray insufficient array type check
@@ -1443,10 +1440,7 @@ exit 0
- S7110704, CVE-2012-0506: CORBA fix
- Add patch to fix compilation with GCC 4.7
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7.0.1-2.0.3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Nov 08 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.1-2.0.3
+* Tue Nov 15 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.1-2.0.3
- Added patch to fix bug in jdk_generic_profile.sh
- Compile with generic profile to use system libraries
- Made remove-intree-libraries.sh more robust
@@ -1456,7 +1450,6 @@ exit 0
* Sun Nov 06 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.1-2.0.2
- Added missing changelog entry
-- Updated Provides
* Sun Nov 06 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.1-2.0.1
- Updated to IcedTea 2.0 tag in the IcedTea OpenJDK7 forest
diff --git a/rhino.patch b/rhino.patch
index 6bb0680..0af9a3c 100644
--- a/rhino.patch
+++ b/rhino.patch
@@ -44,9 +44,9 @@ diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Releas
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
- @# Generate meta-index to make boot and extension class loaders lazier
- $(CD) $(JRE_IMAGE_DIR)/lib && \
- $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
+ ifneq ($(JFR_JAR),)
+ $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
+ endif
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-22 14:10:53.325225237 -0500
diff --git a/sources b/sources
index 4862b3f..4199fc3 100644
--- a/sources
+++ b/sources
@@ -3,6 +3,6 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
868ff2d4457d1a2dccfa465fb8220e1c generated-files.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
-3d2e0ea03940efdd66e260cba1f48359 pulseaudio.tar.gz
8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz
-9f780f477e23729d15720ca56d0819b0 openjdk-icedtea-2.1.tar.gz
+de9dacf33022e55f73adee31680d8fdb openjdk-icedtea-2.2.1.tar.gz
+1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
diff --git a/systemtap.patch b/systemtap.patch
index d5036bd..47cc612 100644
--- a/systemtap.patch
+++ b/systemtap.patch
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/dtrace.make openjdk/hotspot/make/linux/makefiles/dtrace.make
---- openjdk.orig/hotspot/make/linux/makefiles/dtrace.make 2010-07-29 21:54:46.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2011-03-16 20:52:47.269527251 +0000
+--- openjdk.orig/hotspot/make/linux/makefiles/dtrace.make 2012-02-22 14:54:31.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2012-03-18 18:54:13.482968139 +0000
@@ -25,3 +25,7 @@
# Linux does not build jvm_db
LIBJVM_DB =
@@ -10,9 +10,9 @@ diff -Nru openjdk.orig/hotspot/make/linux/makefiles/dtrace.make openjdk/hotspot/
+
+# It doesn't support HAVE_DTRACE_H though.
diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2011-03-14 22:09:03.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2011-03-16 20:52:47.277527381 +0000
-@@ -1817,10 +1817,7 @@
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2012-02-22 14:54:31.000000000 +0000
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2012-03-18 18:54:13.502968466 +0000
+@@ -2818,10 +2818,7 @@
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
JNIWrapper("Set" XSTR(Result) "Field"); \
\
@@ -24,7 +24,7 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/sh
\
oop o = JNIHandles::resolve_non_null(obj); \
klassOop k = o->klass(); \
-@@ -1994,10 +1991,7 @@
+@@ -3128,10 +3125,7 @@
\
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \
JNIWrapper("SetStatic" XSTR(Result) "Field"); \
@@ -36,59 +36,33 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/sh
\
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
assert(id->is_static_field_id(), "invalid static field id"); \
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2011-03-16 20:51:33.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2011-03-16 20:52:47.277527381 +0000
-@@ -2634,16 +2634,16 @@
- FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
- FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
- } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
--#ifdef SOLARIS
-+#ifdef DTRACE_ENABLED
- FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
- FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true);
- FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true);
- FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true);
--#else // ndef SOLARIS
-+#else // ndef DTRACE_ENABLED
- jio_fprintf(defaultStream::error_stream(),
-- "ExtendedDTraceProbes flag is only applicable on Solaris\n");
-+ "ExtendedDTraceProbes flag is only applicable on dtrace enabled builds\n");
- return JNI_EINVAL;
--#endif // ndef SOLARIS
-+#endif // ndef DTRACE_ENABLED
- #ifdef ASSERT
- } else if (match_option(option, "-XX:+FullGCALot", &tail)) {
- FLAG_SET_CMDLINE(bool, FullGCALot, true);
-diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot/src/share/vm/utilities/dtrace.hpp
---- openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp 2011-03-14 22:09:03.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2011-03-16 20:53:58.314683506 +0000
+--- openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp 2012-02-22 15:54:31.000000000 +0100
++++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2012-03-27 13:12:15.857491730 +0200
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright 2009 Red Hat, Inc.
++ * Copyright (c) 2009, 2012 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -25,7 +26,7 @@
- #ifndef SHARE_VM_UTILITIES_DTRACE_HPP
- #define SHARE_VM_UTILITIES_DTRACE_HPP
+@@ -32,12 +33,15 @@
+ #define DTRACE_ONLY(x) x
+ #define NOT_DTRACE(x)
--#if defined(SOLARIS) && defined(DTRACE_ENABLED)
-+#if defined(DTRACE_ENABLED)
-
- #include <sys/sdt.h>
-
-@@ -36,7 +37,7 @@
++#if defined(SOLARIS)
+ // Work around dtrace tail call bug 6672627 until it is fixed in solaris 10.
#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \
do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0)
--#else // ndef SOLARIS || ndef DTRACE_ENABLED
-+#else // ndef DTRACE_ENABLED
-
- #define DTRACE_ONLY(x)
- #define NOT_DTRACE(x) x
-@@ -47,11 +48,18 @@
+-#if defined(SOLARIS)
+ #define USDT1 1
++#elif defined(LINUX)
++#define USDT1 1
++#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
+ #elif defined(__APPLE__)
+ #define USDT2 1
+ #include <sys/types.h>
+@@ -63,6 +67,11 @@
#define DTRACE_PROBE3(a,b,c,d,e) {;}
#define DTRACE_PROBE4(a,b,c,d,e,f) {;}
#define DTRACE_PROBE5(a,b,c,d,e,f,g) {;}
@@ -98,28 +72,29 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot
+#define DTRACE_PROBE9(a,b,c,d,e,f,g,h,i,j,k) {;}
+#define DTRACE_PROBE10(a,b,c,d,e,f,g,h,i,j,k,l) {;}
- #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
+ #else /* USDT2 */
- #endif
-
-+#if defined(SOLARIS)
-+// Solaris dtrace needs actual extern function decls.
+@@ -76,10 +85,19 @@
#define HS_DTRACE_PROBE_FN(provider,name)\
__dtrace_##provider##___##name
-@@ -59,6 +67,11 @@
++#ifdef SOLARIS
++// Solaris dtrace needs actual extern function decls.
+ #define HS_DTRACE_PROBE_DECL_N(provider,name,args) \
DTRACE_ONLY(extern "C" void HS_DTRACE_PROBE_FN(provider,name) args)
#define HS_DTRACE_PROBE_CDECL_N(provider,name,args) \
DTRACE_ONLY(extern void HS_DTRACE_PROBE_FN(provider,name) args)
-+#else
++#elif defined(LINUX)
+// Systemtap dtrace compatible probes on GNU/Linux don't.
+#define HS_DTRACE_PROBE_DECL_N(provider,name,args)
+#define HS_DTRACE_PROBE_CDECL_N(provider,name,args)
-+#endif
++#else
++#error "USDT1 enabled for unknown os"
++#endif
/* Dtrace probe declarations */
#define HS_DTRACE_PROBE_DECL(provider,name) \
-@@ -97,6 +110,8 @@
+@@ -118,6 +136,8 @@
uintptr_t,uintptr_t,uintptr_t))
/* Dtrace probe definitions */
@@ -128,11 +103,11 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot
#define HS_DTRACE_PROBE_N(provider,name, args) \
DTRACE_ONLY(HS_DTRACE_PROBE_FN(provider,name) args)
-@@ -132,5 +147,31 @@
+@@ -153,6 +173,34 @@
HS_DTRACE_PROBE_N(provider,name,((uintptr_t)a0,(uintptr_t)a1,(uintptr_t)a2,\
(uintptr_t)a3,(uintptr_t)a4,(uintptr_t)a5,(uintptr_t)a6,(uintptr_t)a7,\
(uintptr_t)a8,(uintptr_t)a9))
-+#else
++#elif defined(LINUX)
+// Systemtap dtrace compatible probes on GNU/Linux use direct macros.
+#define HS_DTRACE_PROBE(provider,name) HS_DTRACE_PROBE0(provider,name)
+#define HS_DTRACE_PROBE0(provider,name)\
@@ -157,6 +132,9 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot
+ DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)
+#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\
+ DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)
++#else
++#error "USDT1 enabled for unknown os"
+#endif
- #endif // SHARE_VM_UTILITIES_DTRACE_HPP
+ #endif /* !USDT2 */
+
More information about the scm-commits
mailing list