packages: icedtea6/icedtea6-libpath.patch, icedtea6/icedtea6-rpath.patch, i...
jajcus
jajcus at pld-linux.org
Tue Mar 20 15:35:20 CET 2012
Author: jajcus Date: Tue Mar 20 14:35:20 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- Version: 1.9.13
---- Files affected:
packages/icedtea6:
icedtea6-libpath.patch (1.1 -> 1.2) , icedtea6-rpath.patch (1.1 -> 1.2) , icedtea6.spec (1.80 -> 1.81) , openjdk-__LEAF.patch (NONE -> 1.1) (NEW), icedtea6-build.patch (1.1 -> NONE) (REMOVED), icedtea6-ecj_single_thread.patch (1.1 -> NONE) (REMOVED), icedtea6-no_dtdtype_patch.patch (1.1 -> NONE) (REMOVED), icedtea6-system_tray.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/icedtea6/icedtea6-libpath.patch
diff -u packages/icedtea6/icedtea6-libpath.patch:1.1 packages/icedtea6/icedtea6-libpath.patch:1.2
--- packages/icedtea6/icedtea6-libpath.patch:1.1 Mon Jun 7 13:28:15 2010
+++ packages/icedtea6/icedtea6-libpath.patch Tue Mar 20 15:35:15 2012
@@ -1,14 +1,14 @@
---- icedtea6-1.8/patches/hotspot/original/icedtea-6778662-lib64.patch.orig 2010-06-07 11:05:44.906948049 +0200
-+++ icedtea6-1.8/patches/hotspot/original/icedtea-6778662-lib64.patch 2010-06-07 11:06:24.229865044 +0200
-@@ -7,9 +7,9 @@
- -#define DEFAULT_LIBPATH "/lib:/usr/lib"
- +
- +#if defined(AMD64) || defined(_LP64) && (defined(PPC) || defined(S390))
--+#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
-++#define DEFAULT_LIBPATH "/usr/lib64/java:/usr/lib64:/lib64:/lib:/usr/lib"
- +#else
--+#define DEFAULT_LIBPATH "/lib:/usr/lib"
-++#define DEFAULT_LIBPATH "/usr/lib/java:/lib:/usr/lib"
- +#endif
-
- #define EXTENSIONS_DIR "/lib/ext"
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2012-03-20 14:24:27.002521200 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2012-03-20 14:24:59.150654944 +0100
+@@ -286,9 +286,9 @@
+ * 7: The default directories, normally /lib and /usr/lib.
+ */
+ #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
+-#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
++#define DEFAULT_LIBPATH "/usr/lib64/java:/usr/lib64:/lib64:/lib:/usr/lib"
+ #else
+-#define DEFAULT_LIBPATH "/lib:/usr/lib"
++#define DEFAULT_LIBPATH "/usr/lib/java:/lib:/usr/lib"
+ #endif
+
+ #define EXTENSIONS_DIR "/lib/ext"
================================================================
Index: packages/icedtea6/icedtea6-rpath.patch
diff -u packages/icedtea6/icedtea6-rpath.patch:1.1 packages/icedtea6/icedtea6-rpath.patch:1.2
--- packages/icedtea6/icedtea6-rpath.patch:1.1 Sun Apr 18 21:08:10 2010
+++ packages/icedtea6/icedtea6-rpath.patch Tue Mar 20 15:35:15 2012
@@ -1,6 +1,6 @@
---- icedtea6-1.8/Makefile.am~ 2010-04-12 23:55:51.754838172 +0200
-+++ icedtea6-1.8/Makefile.am 2010-04-18 20:37:41.955980316 +0200
-@@ -1546,6 +1546,7 @@
+--- icedtea6-1.9.13/Makefile.am.orig 2012-02-10 14:53:28.000000000 +0100
++++ icedtea6-1.9.13/Makefile.am 2012-03-20 14:20:43.542323616 +0100
+@@ -1703,6 +1703,7 @@
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(MOZILLA_LIBS)\
================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.80 packages/icedtea6/icedtea6.spec:1.81
--- packages/icedtea6/icedtea6.spec:1.80 Sat Feb 11 15:43:55 2012
+++ packages/icedtea6/icedtea6.spec Tue Mar 20 15:35:15 2012
@@ -2,10 +2,12 @@
# TODO:
# - install .ttf fonts (same as in sun-java-base-jre-X11 package) or configure
# it to use system fonts (is it possible?).
+# - prepare the icedtea-web package to provide the plugin and WebStart
%bcond_with bootstrap # don't use gcj, use an installed icedtea6 instead
-%bcond_without plugin # don't build browser plugin
-%bcond_without nss # don't use NSS
+%bcond_with plugin # build browser plugin (icedtea-web is recommended instead)
+%bcond_with webstart # build webstart (icedtea-web is recommended instead)
+%bcond_without nss # don't use NSS
%if %{with bootstrap}
%define use_jdk java-gcj-compat
@@ -21,29 +23,27 @@
Summary: OpenJDK and GNU Classpath code
Summary(pl.UTF-8): Kod OpenJDK i GNU Classpath
Name: icedtea6
-Version: 1.8.3
-Release: 7
+Version: 1.9.13
+Release: 0.1
License: GPL v2
Group: Development/Languages/Java
Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
-# Source0-md5: 879bdc0160da9e0d0210bda75c8f6054
+# Source0-md5: 6a5c0d0ad2fe4bdb6cd851bcc24eac31
# following sources should match those in Makefile.am
-Source1: http://download.java.net/openjdk/jdk6/promoted/b18/openjdk-6-src-b18-16_feb_2010.tar.gz
-# Source1-md5: 94db01691ab38f98b7d42b2ebf4d5c0b
-Source2: http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaxws-2009_10_27.zip
-# Source2-md5: 3ea5728706169498b722b898a1008acf
-Source3: http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_10_27.zip
-# Source3-md5: 7a50bb540a27cdd0001885630088b758
-Source4: https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_13.zip
-# Source4-md5: a2f7b972124cd776ff71e7754eb9a429
+Source1: http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-b20-21_jun_2010.tar.gz
+# Source1-md5: 0b36adbf67e4f261e1b827ed4be4f447
+Source2: http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+# Source2-md5: 91adfd41e6f001add4f92ae31216b1e3
+Source3: http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
+# Source3-md5: bc95c133620bd68c161cac9891592901
+Source4: http://icedtea.classpath.org/download/drops/jdk6-jaxp-b20.zip
+# Source4-md5: 22e95fbdb9fb7d8b6b6fc0a1d76d1fbd
Patch0: %{name}-i486.patch
-Patch1: %{name}-ecj_single_thread.patch
-Patch2: %{name}-no_dtdtype_patch.patch
-Patch3: %{name}-rpath.patch
-Patch4: %{name}-libpath.patch
-Patch5: %{name}-system_tray.patch
-Patch6: %{name}-xul.patch
-Patch7: %{name}-build.patch
+Patch1: %{name}-rpath.patch
+Patch2: %{name}-xul.patch
+Patch3: %{name}-libpath.patch
+# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7103224
+Patch4: openjdk-__LEAF.patch
URL: http://icedtea.classpath.org/wiki/Main_Page
BuildRequires: alsa-lib-devel
BuildRequires: ant-nodeps
@@ -400,24 +400,14 @@
%setup -q
%patch0 -p1
-
-# workaround for an ECJ bug
-#%patch1 -p1
-
-%patch2 -p1
-
# rpath so IcedTeaPlugin.so can find libxul.so and libxpcom.so
-%patch3 -p1
-
-%patch4 -p1
+%patch1 -p1
+%patch2 -p1
# patches to applied to the extracted sources
mkdir -p pld-patches
-cp "%{PATCH5}" pld-patches
-
-%patch6 -p1
-
-cp "%{PATCH7}" pld-patches
+cp "%{PATCH3}" pld-patches
+cp "%{PATCH4}" pld-patches
# let the build system extract the sources where it wants them
mkdir drops
@@ -425,6 +415,7 @@
ln -s %{SOURCE2} drops
ln -s %{SOURCE3} drops
ln -s %{SOURCE4} drops
+ln -s %{SOURCE5} drops
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -453,6 +444,11 @@
%else
--disable-plugin \
%endif
+%if %{with webstart}
+ --enable-webstart \
+%else
+ --disable-webstart \
+%endif
%{!?with_nss:--disable-nss} \
--with-xalan2-jar=%{_javadir}/xalan.jar \
--with-xalan2-serializer-jar=%{_javadir}/serializer.jar \
@@ -481,7 +477,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}
# install the 'JDK image', it contains the JRE too
-cp -a openjdk/build/linux-*/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
+cp -a openjdk.build/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
# convenience symlinks without version number
ln -s %{dstreldir} $RPM_BUILD_ROOT%{_jvmdir}/%{name}
@@ -637,8 +633,8 @@
%files jdk-base
%defattr(644,root,root,755)
-%doc openjdk/build/linux-*/j2sdk-image/THIRD_PARTY_README
-%doc openjdk/build/linux-*/j2sdk-image/ASSEMBLY_EXCEPTION
+%doc openjdk.build/j2sdk-image/THIRD_PARTY_README
+%doc openjdk.build/j2sdk-image/ASSEMBLY_EXCEPTION
%dir %{dstdir}
%{_jvmdir}/%{name}
%attr(755,root,root) %{dstdir}/bin/appletviewer
@@ -687,7 +683,7 @@
%files jre
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/java
-%attr(755,root,root) %{_bindir}/javaws
+%{?with_webstart:%attr(755,root,root) %{_bindir}/javaws}
%attr(755,root,root) %{_bindir}/keytool
%attr(755,root,root) %{_bindir}/orbd
%attr(755,root,root) %{_bindir}/pack200
@@ -697,7 +693,7 @@
%attr(755,root,root) %{_bindir}/tnameserv
%attr(755,root,root) %{_bindir}/unpack200
%{_mandir}/man1/java.1*
-%{_mandir}/man1/javaws.1*
+%{?with_webstart:%{_mandir}/man1/javaws.1*}
%{_mandir}/man1/keytool.1*
%{_mandir}/man1/orbd.1*
%{_mandir}/man1/pack200.1*
@@ -708,7 +704,7 @@
%{_mandir}/man1/unpack200.1*
%lang(ja) %{_mandir}/ja/man1/java.1*
%ifnarch x86_64
-%lang(ja) %{_mandir}/ja/man1/javaws.1*
+%{?with_webstart:%lang(ja) %{_mandir}/ja/man1/javaws.1*}
%endif
%lang(ja) %{_mandir}/ja/man1/keytool.1*
%lang(ja) %{_mandir}/ja/man1/orbd.1*
@@ -721,8 +717,8 @@
%files jre-base
%defattr(644,root,root,755)
-%doc openjdk/build/linux-*/j2sdk-image/THIRD_PARTY_README
-%doc openjdk/build/linux-*/j2sdk-image/ASSEMBLY_EXCEPTION
+%doc openjdk.build/j2sdk-image/THIRD_PARTY_README
+%doc openjdk.build/j2sdk-image/ASSEMBLY_EXCEPTION
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
%dir %{dstdir}
@@ -732,8 +728,10 @@
%dir %{dstdir}/bin
%attr(755,root,root) %{jredir}/bin/java
%attr(755,root,root) %{dstdir}/bin/java
+%if %{with webstart}
%attr(755,root,root) %{jredir}/bin/javaws
%attr(755,root,root) %{dstdir}/bin/javaws
+%endif
%attr(755,root,root) %{jredir}/bin/keytool
%attr(755,root,root) %{dstdir}/bin/keytool
%attr(755,root,root) %{jredir}/bin/orbd
@@ -805,8 +803,10 @@
%{jredir}/lib/security
%{jredir}/lib/zi
#
+%if %{with webstart}
%{jredir}/lib/about.jar
%{jredir}/lib/about.jnlp
+%endif
%{jredir}/lib/calendars.properties
%{jredir}/lib/charsets.jar
%{jredir}/lib/classlist
@@ -892,6 +892,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.81 2012/03/20 14:35:15 jajcus
+- Version: 1.9.13
+
Revision 1.80 2012/02/11 14:43:55 arekm
- rel 7 ; more build fixes
================================================================
Index: packages/icedtea6/openjdk-__LEAF.patch
diff -u /dev/null packages/icedtea6/openjdk-__LEAF.patch:1.1
--- /dev/null Tue Mar 20 15:35:21 2012
+++ packages/icedtea6/openjdk-__LEAF.patch Tue Mar 20 15:35:15 2012
@@ -0,0 +1,216 @@
+
+7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
+Reviewed-by: never
+Contributed-by: Omair Majid <omajid at redhat.com>
+
+--- openjdk.orig/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -107,7 +107,7 @@ extern "C" {
+ if (env != xenv) { \
+ NativeReportJNIFatalError(thr, warn_wrong_jnienv); \
+ } \
+- __ENTRY(result_type, header, thr)
++ VM_ENTRY_BASE(result_type, header, thr)
+
+
+ #define UNCHECKED() (unchecked_jni_NativeInterface)
+--- openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700
+@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text
+ <xsl:value-of select="$space"/>
+ <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
+ <xsl:value-of select="$space"/>
+- <xsl:text>__ENTRY(jvmtiError, </xsl:text>
++ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
+ <xsl:apply-templates select="." mode="functionid"/>
+ <xsl:text> , current_thread)</xsl:text>
+ <xsl:value-of select="$space"/>
+--- openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread
+ // from native so as to resolve the jthread.
+
+ ThreadInVMfromNative __tiv(current_thread);
+- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
++ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
+ debug_only(VMNativeEntryWrapper __vew;)
+
+ oop thread_oop = JNIHandles::resolve_external_guard(thread);
+--- openjdk.orig/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM
+ JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
+ // transition code: native to VM
+ ThreadInVMfromNative __tiv(current_thread);
+- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
++ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
+ debug_only(VMNativeEntryWrapper __vew;)
+
+ JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
+--- openjdk.orig/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700
+@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj
+ }
+ };
+
+-// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
+-// macros. These macros are used to guard entry points into the VM and
+-// perform checks upon leave of the VM.
++// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
++// VM_ENTRY_BASE macros. These macros are used to guard entry points into
++// the VM and perform checks upon leave of the VM.
+
+
+ class InterfaceSupport: AllStatic {
+@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H
+
+ // LEAF routines do not lock, GC or throw exceptions
+
+-#define __LEAF(result_type, header) \
++#define VM_LEAF_BASE(result_type, header) \
+ TRACE_CALL(result_type, header) \
+ debug_only(NoHandleMark __hm;) \
+ /* begin of body */
+@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H
+
+ // ENTRY routines may lock, GC and throw exceptions
+
+-#define __ENTRY(result_type, header, thread) \
++#define VM_ENTRY_BASE(result_type, header, thread) \
+ TRACE_CALL(result_type, header) \
+ HandleMarkCleaner __hm(thread); \
+ Thread* THREAD = thread; \
+@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H
+
+ // QUICK_ENTRY routines behave like ENTRY but without a handle mark
+
+-#define __QUICK_ENTRY(result_type, header, thread) \
++#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \
+ TRACE_CALL(result_type, header) \
+ debug_only(NoHandleMark __hm;) \
+ Thread* THREAD = thread; \
+@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H
+ #define IRT_ENTRY(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJava __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+
+ #define IRT_LEAF(result_type, header) \
+ result_type header { \
+- __LEAF(result_type, header) \
++ VM_LEAF_BASE(result_type, header) \
+ debug_only(No_Safepoint_Verifier __nspv(true);)
+
+
+ #define IRT_ENTRY_NO_ASYNC(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJavaNoAsyncException __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+ // Another special case for nmethod_entry_point so the nmethod that the
+@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H
+ result_type header { \
+ nmethodLocker _nmlock(nm); \
+ ThreadInVMfromJavaNoAsyncException __tiv(thread); \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+ #define IRT_END }
+
+@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H
+ #define JRT_ENTRY(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJava __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+
+ #define JRT_LEAF(result_type, header) \
+ result_type header { \
+- __LEAF(result_type, header) \
++ VM_LEAF_BASE(result_type, header) \
+ debug_only(JRT_Leaf_Verifier __jlv;)
+
+
+ #define JRT_ENTRY_NO_ASYNC(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJavaNoAsyncException __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+ // Same as JRT Entry but allows for return value after the safepoint
+@@ -543,11 +543,11 @@ extern "C" {
+ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+
+ // Ensure that the VMNativeEntryWrapper constructor, which can cause
+-// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
++// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
+ #define JNI_QUICK_ENTRY(result_type, header) \
+ extern "C" { \
+ result_type JNICALL header { \
+@@ -555,7 +555,7 @@ extern "C" {
+ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __QUICK_ENTRY(result_type, header, thread)
++ VM_QUICK_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JNI_LEAF(result_type, header) \
+@@ -563,7 +563,7 @@ extern "C" {
+ result_type JNICALL header { \
+ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+- __LEAF(result_type, header)
++ VM_LEAF_BASE(result_type, header)
+
+
+ // Close the routine and the extern "C"
+@@ -579,7 +579,7 @@ extern "C" {
+ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JVM_ENTRY_NO_ENV(result_type, header) \
+@@ -588,7 +588,7 @@ extern "C" {
+ JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JVM_QUICK_ENTRY(result_type, header) \
+@@ -597,14 +597,14 @@ extern "C" {
+ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __QUICK_ENTRY(result_type, header, thread)
++ VM_QUICK_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JVM_LEAF(result_type, header) \
+ extern "C" { \
+ result_type JNICALL header { \
+ VM_Exit::block_if_vm_exited(); \
+- __LEAF(result_type, header)
++ VM_LEAF_BASE(result_type, header)
+
+
+ #define JVM_END } }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6-libpath.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6-rpath.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.80&r2=1.81&f=u
More information about the pld-cvs-commit
mailing list