rpms/gcc/devel gcc41-java-backport-class-loader.patch, NONE, 1.1 gcc41.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26854

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-java-backport-class-loader.patch 
Log Message:
* Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13
- Backport fix by Andrew Haley for build problems related with the
bootstrap ClassLoader.


gcc41-java-backport-class-loader.patch:
 natSharedLibLoader.cc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-java-backport-class-loader.patch ---
From: Andrew Haley <aph at redhat.com>

I found a libjava bug that may be causing these build failures.  Here
is the patch; please apply it and rebuild.

2006-07-25  Andrew Haley  <aph at redhat.com>

	* gnu/gcj/runtime/natSharedLibLoader.cc (init): Don't set
	curLoader to VMClassLoader::bootLoader.

--- libjava/gnu/gcj/runtime/natSharedLibLoader.cc~	2006-07-25 16:47:05.000000000 +0100
+++ libjava/gnu/gcj/runtime/natSharedLibLoader.cc	2006-07-25 18:11:25.000000000 +0100
@@ -20,6 +20,8 @@
 #include <java/lang/UnsupportedOperationException.h>
 #include <java/lang/UnknownError.h>
 
+#include <java/lang/VMClassLoader.h>
+
 // If we're using the Boehm GC, then we need this include to override dlopen.
 #ifdef HAVE_BOEHM_GC
 // Set GC_DEBUG before including gc.h!
@@ -87,7 +89,8 @@
     flags = RTLD_GLOBAL | RTLD_LAZY;
   JvSynchronize dummy1(&java::lang::Class::class$);
   SharedLibDummy dummy2;
-  curLoader = loader;
+  curLoader = ((void*)loader == java::lang::VMClassLoader::bootLoader
+	       ? NULL : loader);
   curHelper = this;
   _Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
   _Jv_RegisterCoreHook = core_hook;


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gcc41.spec	24 Jul 2006 20:04:26 -0000	1.87
+++ gcc41.spec	25 Jul 2006 18:27:23 -0000	1.88
@@ -1,6 +1,6 @@
 %define DATE 20060721
 %define gcc_version 4.1.1
-%define gcc_release 12
+%define gcc_release 13
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -140,6 +140,7 @@
 Patch32: gcc41-java-libdotdotlib.patch
 Patch33: gcc41-java-plugins.patch
 Patch34: gcc41-java-backport-gcjplugin.patch
+Patch35: gcc41-java-backport-class-loader.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -456,6 +457,7 @@
 %patch32 -p0 -b .java-libdotdotlib~
 %patch33 -p0 -b .java-plugins~
 %patch34 -p0 -b .java-gcjplugin~
+%patch35 -p0 -b .java-class-loader~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1518,8 +1520,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13
+- Backport fix by Andrew Haley for build problems related with the
+bootstrap ClassLoader.
+
 * Mon Jul 24 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-12
-- Backport fix for NullPointerException in GCJ web plugin.
+- Backport fix by Mark Wielaard for NullPointerException in GCJ web plugin.
 
 * Fri Jul 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-11
 - update from gcc-4_1-branch (-r115565:115644)