diff options
author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-05 21:21:05 +0000 |
---|---|---|
committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-05 21:21:05 +0000 |
commit | 4885679ac651aeed106e89c25468ebcad3e5336c (patch) | |
tree | 07dd6e5ce97f13710348e5b46c877a6083e1d397 | |
parent | 2bc98306edc176961bc1602d1f84183a418c2be6 (diff) | |
download | gcc-4885679ac651aeed106e89c25468ebcad3e5336c.tar.gz |
PR libgcj/27860
* link.cc: Check for closure support in libffi with FFI_CLOSURES.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114411 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | libjava/ChangeLog | 5 | ||||
-rw-r--r-- | libjava/link.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a45de6ce699..38660610526 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-06-05 Andreas Schwab <schwab@suse.de> + + PR libgcj/27860 + * link.cc: Check for closure support in libffi with FFI_CLOSURES. + 2006-06-05 Tom Tromey <tromey@redhat.com> PR libgcj/27892: diff --git a/libjava/link.cc b/libjava/link.cc index 4f01cb54564..f95b1287888 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -788,7 +788,7 @@ _Jv_ThrowNoSuchMethodError () throw new java::lang::NoSuchMethodError; } -#ifdef USE_LIBFFI +#if defined USE_LIBFFI && FFI_CLOSURES // A function whose invocation is prepared using libffi. It gets called // whenever a static method of a missing class is invoked. The data argument // holds a reference to a String denoting the missing class. @@ -974,7 +974,7 @@ _Jv_Linker::find_iindex (jclass *ifaces, jshort *offsets, jshort num) return i; } -#ifdef USE_LIBFFI +#if defined USE_LIBFFI && FFI_CLOSURES // We use a structure of this type to store the closure that // represents a missing method. struct method_closure @@ -1027,7 +1027,7 @@ _Jv_Linker::create_error_method (_Jv_Utf8Const *) // of the missing class then. return (void *) _Jv_ThrowNoClassDefFoundError; } -#endif // USE_LIBFFI +#endif // USE_LIBFFI && FFI_CLOSURES // Functions for indirect dispatch (symbolic virtual binding) support. |