This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Java build broken


Hi,

On Fri, 2004-11-26 at 00:51, Andrew Pinski wrote:
> On Nov 25, 2004, at 6:45 PM, Andrew Pinski wrote:
> > On Nov 25, 2004, at 5:46 PM, Mark Wielaard wrote:
> >> On Thu, 2004-11-25 at 23:12, Ulrich Weigand wrote:
> >>> Well, I started the bootstrap from a completely empty build 
> >>> directory;
> >>> I don't know how much cleaner I could get ...
> >>
> >> A fresh bootstrap worked a couple of hours ago for me on
> >> i686-pc-linux-gnu. A simple make also worked on
> >> powerpc-unknown-linux-gnu. I'll do a new checkout and a fresh build to
> >> see how that goes. (*)
> >
> > This should fix it but I have not tested it yet.
> 
> That will not work.
> Try this instead

Thanks. After updating CVS it started failing in the same way Ulrich
reported (the BC merge and some compiler fixes hit CVS almost at the
same time it seems). Andrew his patch fixes it again for me (plus some
extra changes which are attached. Again thanks to pinskia and Farfetch
on irc). And the BITMAP thing is fixed now also in CVS.

OK to commit this:

2004-11-25  Andrew Pinski  <pinskia@physics.uc.edu>

        * gnu/gcj/util/natDebug.cc (getField): Remove bogus :: in declaration.
        * java/lang/Class.h (_Jv_getInterfaceMethod): Add forward declaration
        and fix fix declaration.
        (_Jv_Linker): Likewise.
        (_Jv_ExecutionEngine): Likewise.
        (_Jv_CompiledEngine): Likewise.
        (_Jv_InterpreterEngine): Likewise.

This make the libjava dir compile again with the new g++ compiler fixes.

Cheers,

Mark
Index: gnu/gcj/util/natDebug.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/util/natDebug.cc,v
retrieving revision 1.2
diff -u -r1.2 natDebug.cc
--- gnu/gcj/util/natDebug.cc	25 Nov 2004 11:54:53 -0000	1.2
+++ gnu/gcj/util/natDebug.cc	26 Nov 2004 00:46:30 -0000
@@ -40,8 +40,8 @@
 }
 
 static void *
-::getField (::java::lang::Object *obj, 
-	    ::java::lang::reflect::Field *field)
+getField (::java::lang::Object *obj, 
+	  ::java::lang::reflect::Field *field)
 {
   using namespace java::lang::reflect;
   
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Class.h,v
retrieving revision 1.73
diff -u -r1.73 Class.h
--- java/lang/Class.h	25 Nov 2004 03:47:03 -0000	1.73
+++ java/lang/Class.h	26 Nov 2004 00:46:31 -0000
@@ -227,6 +227,9 @@
 
 jboolean _Jv_CheckAccess (jclass self_klass, jclass other_klass,
 			  jint flags);
+bool _Jv_getInterfaceMethod (jclass search_class, jclass &found_class,
+			     int &index, const _Jv_Utf8Const *utf_name,
+			     const _Jv_Utf8Const *utf_sig);
 jclass _Jv_GetArrayClass (jclass klass, java::lang::ClassLoader *loader);
 
 #ifdef INTERPRETER
@@ -239,6 +242,10 @@
 #endif
 
 class _Jv_BytecodeVerifier;
+class _Jv_Linker;
+class _Jv_ExecutionEngine;
+class _Jv_CompiledEngine;
+class _Jv_InterpreterEngine;
 class gnu::gcj::runtime::StackTrace;
 class java::io::VMObjectStreamClass;
 
@@ -454,9 +461,9 @@
   friend jboolean (::_Jv_CheckAccess) (jclass self_klass, jclass other_klass,
 				   jint flags);
   
-  friend bool _Jv_getInterfaceMethod(jclass, jclass&, int&, 
-				     const _Jv_Utf8Const*,
-				     const _Jv_Utf8Const*);
+  friend bool ::_Jv_getInterfaceMethod(jclass, jclass&, int&, 
+				       const _Jv_Utf8Const*,
+				       const _Jv_Utf8Const*);
 
   friend jclass (::_Jv_GetArrayClass) (jclass klass,
 				       java::lang::ClassLoader *loader);
@@ -478,10 +485,10 @@
   friend class gnu::gcj::runtime::StackTrace;
   friend class java::io::VMObjectStreamClass;
 
-  friend class _Jv_Linker;
-  friend class _Jv_ExecutionEngine;
-  friend class _Jv_CompiledEngine;
-  friend class _Jv_InterpreterEngine;
+  friend class ::_Jv_Linker;
+  friend class ::_Jv_ExecutionEngine;
+  friend class ::_Jv_CompiledEngine;
+  friend class ::_Jv_InterpreterEngine;
 
   friend void ::_Jv_sharedlib_register_hook (jclass klass);
 

Attachment: signature.asc
Description: This is a digitally signed message part


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]