Re: [PATCH] Cleanup patches to build libgcj on x86/linux

[Alexandre Petit-Bianco <apbianco at cygnus dot com>]

Alexandre Petit-Bianco writes:

> I'm trying to build the latest and greatest (compiler and runtime)
> and I found that a patch like the one below was necessary.

Actually, this patch might be better. But then I'm getting a lot of
error building the Boehm GC:

  /home/apbianco/src/libgcj/libjava/boehm.cc:313: at this point in file
  /home/apbianco/src/libgcj/libjava/boehm.cc: In function `void
  *_Jv_AllocBytes (__java_int)':
  /home/apbianco/src/libgcj/boehm-gc/gc_priv.h:1716: too many arguments
  to function `char *GC_generic_malloc ()'

The C++ compiler all in a sudden started to be really picky -- or did
we have a way to silence it before which broke all in a sudden?

./A

2000-07-26  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * jni.cc (_Jv_JNIMethod::call): Type the cast of the second
        argument to `ffi_raw_call' changed to match prototype.
        * interpret.cc (_Jv_InterpMethod::continue1): Likewise.
        * libjava/java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA):
        Type the cast of the second argument to `ffi_call' changed to
        match prototype.
        
Index: libjava/interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.17
diff -u -p -r1.17 interpret.cc
--- interpret.cc        2000/05/31 22:49:18     1.17
+++ interpret.cc        2000/07/26 06:45:16
@@ -706,7 +706,7 @@ void _Jv_InterpMethod::continue1 (_Jv_In
 #if FFI_NATIVE_RAW_API
        /* We assume that this is only implemented if it's correct      */
        /* to use it here.  On a 64 bit machine, it never is.           */
-       ffi_raw_call (cif, fun, (void*)&rvalue, raw);
+       ffi_raw_call (cif, (void (*)()) fun, (void*)&rvalue, raw);
 #else
        ffi_java_raw_call (cif, fun, (void*)&rvalue, raw);
 #endif
Index: libjava/jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.31
diff -u -p -r1.31 jni.cc
--- jni.cc      2000/04/20 17:39:30     1.31
+++ jni.cc      2000/07/26 06:45:21
@@ -1784,7 +1784,7 @@ _Jv_JNIMethod::call (ffi_cif *, void *re
   memcpy (&real_args[offset], args, _this->args_raw_size);
 
   // The actual call to the JNI function.
-  ffi_raw_call (&_this->jni_cif, (void (*) (...)) _this->function,
+  ffi_raw_call (&_this->jni_cif, (void (*) ()) _this->function,
                ret, real_args);
 
   _Jv_JNI_PopSystemFrame (env);
Index: libjava/java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.11
diff -u -p -r1.11 natMethod.cc
--- natMethod.cc        2000/06/23 17:39:00     1.11
+++ natMethod.cc        2000/07/26 06:45:24
@@ -413,7 +413,7 @@ _Jv_CallAnyMethodA (jobject obj,
 
   try
     {
-      ffi_call (&cif, (void (*) (...)) meth->ncode, result, values);
+      ffi_call (&cif, (void (*) ()) meth->ncode, result, values);
     }
   catch (Throwable *ex2)
     {