diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2003-10-20 18:37:22 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2003-10-20 18:37:22 +0000 |
| commit | 27d54b2a6c18ef1ae50f1a5b432d590438445b90 (patch) | |
| tree | 13e03635b2317c29fc21a0e32a7788d86cf843a7 /libffi | |
| parent | 480feac0238a176178fb76a7ef2e0690ca74022c (diff) | |
| download | gcc-27d54b2a6c18ef1ae50f1a5b432d590438445b90.zip gcc-27d54b2a6c18ef1ae50f1a5b432d590438445b90.tar.gz gcc-27d54b2a6c18ef1ae50f1a5b432d590438445b90.tar.bz2 | |
ffi.c: Use _ABIN32, _ABIO32 instead of external _MIPS_SIM_NABI32, _MIPS_SIM_ABI32.
libffi:
* src/mips/ffi.c: Use _ABIN32, _ABIO32 instead of external
_MIPS_SIM_NABI32, _MIPS_SIM_ABI32.
libstdc++-v3:
* config/cpu/mips/atomicity.h (__atomic_add): Use _ABIO32 instead
of external _MIPS_SIM_ABI32.
boehm-gc:
* mips_sgi_mach_dep.s: Use _ABIO32 instead of external
_MIPS_SIM_ABI32.
gcc:
* config/mips/linux.h (TARGET_OS_CPP_BUILTINS): Define _ABIO32.
Use it in _MIPS_SIM definition.
* config/mips/mips.h (CRT_CALL_STATIC_FUNCTION): Likewise.
From-SVN: r72713
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | libffi/src/mips/ffi.c | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 627a5f8..7d553b7 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2003-10-20 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * src/mips/ffi.c: Use _ABIN32, _ABIO32 instead of external + _MIPS_SIM_NABI32, _MIPS_SIM_ABI32. + 2003-10-19 Andreas Tobler <a.tobler@schweiz.ch> * src/powerpc/ffi_darwin.c (ffi_prep_args): Declare bytes again. diff --git a/libffi/src/mips/ffi.c b/libffi/src/mips/ffi.c index 93f7923..01ad20e 100644 --- a/libffi/src/mips/ffi.c +++ b/libffi/src/mips/ffi.c @@ -29,7 +29,7 @@ #include <stdlib.h> -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 #define FIX_ARGP \ FFI_ASSERT(argp <= &stack[bytes]); \ if (argp == &stack[bytes]) \ @@ -55,7 +55,7 @@ static void ffi_prep_args(char *stack, register char *argp; register ffi_type **p_arg; -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 /* If more than 8 double words are used, the remainder go on the stack. We reorder stuff on the stack here to support this easily. */ @@ -69,7 +69,7 @@ static void ffi_prep_args(char *stack, memset(stack, 0, bytes); -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 if ( ecif->cif->rstruct_flag != 0 ) #else if ( ecif->cif->rtype->type == FFI_TYPE_STRUCT ) @@ -92,7 +92,7 @@ static void ffi_prep_args(char *stack, FIX_ARGP; } -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 #define OFFSET 0 #else #define OFFSET sizeof(int) @@ -146,7 +146,7 @@ static void ffi_prep_args(char *stack, } else { -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 memcpy(argp, *p_argv, z); #else { @@ -178,7 +178,7 @@ static void ffi_prep_args(char *stack, return; } -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 /* The n32 spec says that if "a chunk consists solely of a double float field (but not a double, which is part of a union), it @@ -267,7 +267,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) { cif->flags = 0; -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 /* Set the flags necessary for O32 processing */ if (cif->rtype->type != FFI_TYPE_STRUCT) @@ -322,7 +322,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) } #endif -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 /* Set the flags necessary for N32 processing */ { unsigned shift = 0; @@ -441,14 +441,14 @@ void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) switch (cif->abi) { -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 case FFI_O32: ffi_call_O32(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue, fn); break; #endif -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 case FFI_N32: ffi_call_N32(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue, fn); |