summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraph <aph>2009-06-04 14:39:20 +0000
committeraph <aph>2009-06-04 14:39:20 +0000
commit7c3b7fd6b5db746b5b09a718f3044f811372f941 (patch)
treed5275e2005f574d5a44f3dff4a0f2c1f31b30dbf
parent1a2f93a8b362db13638afd9fcb3f2650180bfa17 (diff)
downloadlibffi-7c3b7fd6b5db746b5b09a718f3044f811372f941.tar.gz
2009-06-04 Andrew Haley <aph@redhat.com>
* src/sh64/ffi.c: Remove lint directives. Was missing from merge of Andreas Tobler's patch from 2006-04-22.
-rw-r--r--libffi/ChangeLog.libffi5
-rw-r--r--libffi/src/sh64/ffi.c10
2 files changed, 7 insertions, 8 deletions
diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index 447da97..004ed77 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,5 +1,10 @@
2009-06-04 Andrew Haley <aph@redhat.com>
+ * src/sh64/ffi.c: Remove lint directives. Was missing from merge
+ of Andreas Tobler's patch from 2006-04-22.
+
+2009-06-04 Andrew Haley <aph@redhat.com>
+
* src/sh/ffi.c: Apply missing hunk from Alexandre Oliva's patch of
2007-03-07.
diff --git a/libffi/src/sh64/ffi.c b/libffi/src/sh64/ffi.c
index 3a2fe9c..8fbc05c 100644
--- a/libffi/src/sh64/ffi.c
+++ b/libffi/src/sh64/ffi.c
@@ -56,9 +56,7 @@ return_type (ffi_type *arg)
/* ffi_prep_args is called by the assembly routine once stack space
has been allocated for the function's arguments */
-/*@-exportheader@*/
void ffi_prep_args(char *stack, extended_cif *ecif)
-/*@=exportheader@*/
{
register unsigned int i;
register unsigned int avn;
@@ -270,9 +268,7 @@ void ffi_call(/*@dependent@*/ ffi_cif *cif,
else if ((rvalue == NULL) &&
(cif->rtype->type == FFI_TYPE_STRUCT))
{
- /*@-sysunrecog@*/
ecif.rvalue = alloca(cif->rtype->size);
- /*@=sysunrecog@*/
}
else
ecif.rvalue = rvalue;
@@ -280,10 +276,8 @@ void ffi_call(/*@dependent@*/ ffi_cif *cif,
switch (cif->abi)
{
case FFI_SYSV:
- /*@-usedef@*/
- ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes,
- cif->flags, cif->flags2, ecif.rvalue, fn);
- /*@=usedef@*/
+ ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes, cif->flags, cif->flags2,
+ ecif.rvalue, fn);
break;
default:
FFI_ASSERT(0);