From 433e6a8cf26e3d3164250884b088dd396c131b9f Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 12 Jul 2007 02:19:41 +0000 Subject: [PATCH] ffi.c: Don't include sys/cachectl.h. * src/mips/ffi.c: Don't include sys/cachectl.h. (ffi_prep_closure_loc): Use __builtin___clear_cache() instead of cacheflush(). From-SVN: r126567 --- libffi/ChangeLog | 6 ++++++ libffi/src/mips/ffi.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 7cb003670a7..27760849cf0 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2007-07-11 David Daney + + * src/mips/ffi.c: Don't include sys/cachectl.h. + (ffi_prep_closure_loc): Use __builtin___clear_cache() instead of + cacheflush(). + 2007-05-18 Aurelien Jarno * src/arm/ffi.c (ffi_prep_closure_loc): Renamed and ajusted diff --git a/libffi/src/mips/ffi.c b/libffi/src/mips/ffi.c index e5446807c09..12b8b62bab9 100644 --- a/libffi/src/mips/ffi.c +++ b/libffi/src/mips/ffi.c @@ -27,7 +27,6 @@ #include #include -#include #if _MIPS_SIM == _ABIN32 #define FIX_ARGP \ @@ -506,6 +505,7 @@ ffi_prep_closure_loc (ffi_closure *closure, unsigned int *tramp = (unsigned int *) &closure->tramp[0]; unsigned int fn; unsigned int ctx = (unsigned int) codeloc; + char *clear_location = (char *) codeloc; #if defined(FFI_MIPS_O32) FFI_ASSERT(cif->abi == FFI_O32 || cif->abi == FFI_O32_SOFT_FLOAT); @@ -525,8 +525,7 @@ ffi_prep_closure_loc (ffi_closure *closure, closure->fun = fun; closure->user_data = user_data; - /* XXX this is available on Linux, but anything else? */ - cacheflush (codeloc, FFI_TRAMPOLINE_SIZE, ICACHE); + __builtin___clear_cache(clear_location, clear_location + FFI_TRAMPOLINE_SIZE); return FFI_OK; } -- 2.30.2