Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2012-06-28 15:29:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2012-06-18 17:33:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2012-06-28 15:29:48.000000000 +0200
@@ -1,0 +2,22 @@
+Thu Jun 21 10:14:18 UTC 2012 - [email protected]
+
+- update to icedtea-2.2.1
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file
loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for
temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
+ - S7165628, CVE-2012-1726: Issues with java.lang.invoke.MethodHandles.Lookup
+- reduce number of file-listed-more-than-one for jre
+- remove hardcoded amd64 from systemtap path
+- use java-1_7_0-openjdk for build
+
+-------------------------------------------------------------------
Old:
----
java-1.7.0-openjdk-arm-ftbfs.patch
java-1.7.0-openjdk-remove-mimpure-opt.patch
java-1.7.0-openjdk-system-zlib.patch
openjdk-icedtea-2.1.tar.gz
systemtap-alloc-size-workaround.patch
New:
----
openjdk-icedtea-2.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.jfOa4X/_old 2012-06-28 15:29:59.000000000 +0200
+++ /var/tmp/diff_new_pack.jfOa4X/_new 2012-06-28 15:29:59.000000000 +0200
@@ -38,7 +38,7 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedtea_version 2.1
+%define icedtea_version 2.2.1
%define hg_tag icedtea-{icedtea_version}-branchpoint
%define openjdkver 147
@@ -200,18 +200,11 @@
# Patches for Arm
Patch103: java-1.7.0-openjdk-arm-fixes.patch
-Patch104: java-1.7.0-openjdk-arm-ftbfs.patch
# Patch for PPC/PPC64
Patch105: java-1.7.0-openjdk-ppc-zero-jdk.patch
Patch106: java-1.7.0-openjdk-ppc-zero-hotspot.patch
-# Fix bug in jdk_generic_profile.sh
-Patch107: java-1.7.0-openjdk-system-zlib.patch
-
-# Remove option no longer accepted by GCC
-Patch108: java-1.7.0-openjdk-remove-mimpure-opt.patch
-
#
# Bootstrap patches (code with this is never shipped)
#
@@ -227,7 +220,6 @@
# SystemTap support
# Workaround for RH613824
-Patch301: systemtap-alloc-size-workaround.patch
Patch302: systemtap.patch
# SUSE patches - from java-1_6_0-openjdk package
@@ -267,14 +259,12 @@
BuildRequires: ecj-bootstrap
BuildRequires: java-1_5_0-gcj-compat-devel
%else
-#XXX: HACK - in order to support the transition period between jdk6->jdk7
-# let require at least openjdk6 for build and let have prefs on project level
-# after all stuff wil be working, let switch to java-1_7_0-openjdk
-#BuildRequires: java-1_7_0-openjdk
-#BuildRequires: java-1_7_0-openjdk-devel
-BuildRequires: java-devel-openjdk >= 1.6.0
-BuildRequires: jre-openjdk >= 1.6.0
+BuildRequires: java-1_7_0-openjdk
+BuildRequires: java-1_7_0-openjdk-devel
+#BuildRequires: java-devel-openjdk >= 1.6.0
+#BuildRequires: jre-openjdk >= 1.6.0
%endif
+BuildRequires: zlib-devel
BuildRequires: mozilla-nss-devel
# can be disabled using --disable-compile-against-syscalls
@@ -340,25 +330,14 @@
BuildRequires: openssl-certs
%endif
+Requires: lcms2
Requires: rhino
# Require jpackage-utils for ant.
Requires: jpackage-utils >= 1.7.3
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
-%if ! %defined suse_version
-# Post requires alternatives to install tool alternatives.
-Requires(post): update-alternatives
-# Postun requires alternatives to uninstall tool alternatives.
-Requires(postun): update-alternatives
-# Post requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(post): desktop-file-utils
-# Postun requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(postun): desktop-file-utils
-%else
+
Requires(pre): update-alternatives
-%endif
%if %{with_systemtap}
Recommends: systemtap >= 1.0
%endif
@@ -491,6 +470,7 @@
%setup -q -c -n %{name}
%setup -q -n %{name} -T -D -a 3
%setup -q -n %{name} -T -D -a 1
+
cp %{SOURCE4} .
# OpenJDK patches
@@ -503,7 +483,6 @@
# Add systemtap patches if enabled
%if %{with_systemtap}
-%patch301
%patch302
%endif
@@ -527,7 +506,7 @@
for file in tapset/*.in; do
OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
- sed -e
s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/amd64/server/libjvm.so:g
$file > $OUTPUT_FILE
+ sed -e
s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so:g
$file > $OUTPUT_FILE
sed -i -e '/@ABS_CLIENT_LIBJVM_SO@/d' $OUTPUT_FILE
sed -i -e s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir}:g $OUTPUT_FILE
sed -i -e s:@INSTALL_ARCH_DIR@:%{archinstall}:g $OUTPUT_FILE
@@ -575,11 +554,10 @@
# Type fixes
qpatch -p0 %{PATCH101}
-qpatch -p0 %{PATCH102}
+#qpatch -p0 %{PATCH102}
# Arm fixes
qpatch -p0 %{PATCH103}
-qpatch -p0 %{PATCH104}
%ifarch ppc ppc64
# PPC fixes
@@ -587,10 +565,6 @@
qpatch -p0 %{PATCH106}
%endif
-# Misc. fixes
-qpatch -p0 %{PATCH107}
-qpatch -p0 %{PATCH108}
-
#SUSE specific fixes
qpatch -p1 %{PATCH1001}
qpatch -p1 %{PATCH1002}
@@ -709,6 +683,7 @@
export PATH=$OLD_PATH
cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
+ chmod 0664 $JAVA_HOME/jre/lib/ext/gnome-java-bridge.jar
popd
# Copy tz.properties
@@ -1037,6 +1012,8 @@
%{_mandir}/man1/javap-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \
%{_mandir}/man1/jconsole-%{sdklnk}.1$ext \
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \
+ %{_mandir}/man1/jcmd-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
%{_mandir}/man1/jdb-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \
@@ -1121,7 +1098,28 @@
%{_jvmjardir}/%{sdkdir}/
+%dir %{_jvmdir}/%{sdkdir}/jre/
+%dir %{_jvmdir}/%{sdkdir}/jre/lib
+
+%{_jvmdir}/%{sdkdir}/jre/bin/
+
+# jre/lib
+%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/
+%{_jvmdir}/%{sdkdir}/jre/lib/applet/
+%{_jvmdir}/%{sdkdir}/jre/lib/cmm/
+%{_jvmdir}/%{sdkdir}/jre/lib/ext/
+%{_jvmdir}/%{sdkdir}/jre/lib/images/
+%dir %{_jvmdir}/%{jredir}/lib/management/
%dir %{_jvmdir}/%{jredir}/lib/security
+%{_jvmdir}/%{jredir}/lib/servicetag/
+%{_jvmdir}/%{sdkdir}/jre/lib/zi/
+%{_jvmdir}/%{sdkdir}/jre/lib/*jar
+%{_jvmdir}/%{sdkdir}/jre/lib/classlist
+%{_jvmdir}/%{sdkdir}/jre/lib/currency.data
+%{_jvmdir}/%{sdkdir}/jre/lib/jexec
+%{_jvmdir}/%{sdkdir}/jre/lib/jvm.hprof.txt
+%{_jvmdir}/%{sdkdir}/jre/lib/meta-index
+
# % if %{suse_version} < 1130
# % config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
# % else
@@ -1133,12 +1131,10 @@
#bnc#637224
%config(noreplace) %{_jvmdir}/%{jredir}/lib/fontconfig.*
%config(noreplace) %{_jvmdir}/%{jredir}/lib/*.properties
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/management/jmxremote.access
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/management/management.properties
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/psfont.properties.ja
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/management/*
%config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties
-%{_jvmdir}/%{sdkdir}/jre/
-
%{_datadir}/applications/policytool-%{sdklnk}.desktop
%{_datadir}/icons/hicolor/*/apps/java.png
@@ -1188,6 +1184,7 @@
%{_mandir}/man1/javah-%{sdklnk}.1*
%{_mandir}/man1/javap-%{sdklnk}.1*
%{_mandir}/man1/jconsole-%{sdklnk}.1*
+%{_mandir}/man1/jcmd-%{sdklnk}.1*
%{_mandir}/man1/pack200-%{sdklnk}.1*
%{_mandir}/man1/unpack200-%{sdklnk}.1*
%{_mandir}/man1/jdb-%{sdklnk}.1*
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
--- /var/tmp/diff_new_pack.jfOa4X/_old 2012-06-28 15:29:59.000000000 +0200
+++ /var/tmp/diff_new_pack.jfOa4X/_new 2012-06-28 15:29:59.000000000 +0200
@@ -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
++++++ openjdk-icedtea-2.1.tar.gz -> openjdk-icedtea-2.2.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/openjdk-icedtea-2.1.tar.gz
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/openjdk-icedtea-2.2.1.tar.gz
differ: char 5, line 1
++++++ rhino.patch ++++++
--- /var/tmp/diff_new_pack.jfOa4X/_old 2012-06-28 15:29:59.000000000 +0200
+++ /var/tmp/diff_new_pack.jfOa4X/_new 2012-06-28 15:29:59.000000000 +0200
@@ -44,9 +44,9 @@
$(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
++++++ systemtap.patch ++++++
--- /var/tmp/diff_new_pack.jfOa4X/_old 2012-06-28 15:29:59.000000000 +0200
+++ /var/tmp/diff_new_pack.jfOa4X/_new 2012-06-28 15:29:59.000000000 +0200
@@ -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 @@
+
+# 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 @@
\
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 @@
\
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 @@
+#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 @@
#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 @@
+ 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 */
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
