diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-09-23 14:50:35 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2009-09-23 14:50:35 +0000 |
| commit | 29d1370a8fbaf23079926093cf132eced5ea7d97 (patch) | |
| tree | 148e888d7218702cb2b6b3f39c60cd2aad43d5df /libffi | |
| parent | 28baf121d3bb8c2b6c68d673a5cce81153f55871 (diff) | |
| download | gcc-29d1370a8fbaf23079926093cf132eced5ea7d97.zip gcc-29d1370a8fbaf23079926093cf132eced5ea7d97.tar.gz gcc-29d1370a8fbaf23079926093cf132eced5ea7d97.tar.bz2 | |
PR libffi/40242, PR libffi/41443
2009-09-23 Matthias Klose <doko@ubuntu.com>
PR libffi/40242, PR libffi/41443
* src/arm/sysv.S (__ARM_ARCH__): Define for processors
__ARM_ARCH_6T2__, __ARM_ARCH_6M__, __ARM_ARCH_7__,
__ARM_ARCH_7A__, __ARM_ARCH_7R__, __ARM_ARCH_7M__.
Change the conditionals to __SOFTFP__ || __ARM_EABI__
for -mfloat-abi=softfp to work.
From-SVN: r152075
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 9 | ||||
| -rw-r--r-- | libffi/src/arm/sysv.S | 23 |
2 files changed, 24 insertions, 8 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 3600fd9..f92eb3e 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,12 @@ +2009-09-23 Matthias Klose <doko@ubuntu.com> + + PR libffi/40242, PR libffi/41443 + * src/arm/sysv.S (__ARM_ARCH__): Define for processors + __ARM_ARCH_6T2__, __ARM_ARCH_6M__, __ARM_ARCH_7__, + __ARM_ARCH_7A__, __ARM_ARCH_7R__, __ARM_ARCH_7M__. + Change the conditionals to __SOFTFP__ || __ARM_EABI__ + for -mfloat-abi=softfp to work. + 2009-09-17 Loren J. Rittle <ljrittle@acm.org> PR testsuite/32843 (strikes again) diff --git a/libffi/src/arm/sysv.S b/libffi/src/arm/sysv.S index 34481c8..4c289c6 100644 --- a/libffi/src/arm/sysv.S +++ b/libffi/src/arm/sysv.S @@ -67,11 +67,18 @@ #if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ - || defined(__ARM_ARCH_6ZK__) + || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ + || defined(__ARM_ARCH_6M__) # undef __ARM_ARCH__ # define __ARM_ARCH__ 6 #endif +#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ + || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) +# undef __ARM_ARCH__ +# define __ARM_ARCH__ 7 +#endif + #if __ARM_ARCH__ >= 5 # define call_reg(x) blx x #elif defined (__ARM_ARCH_4T__) @@ -189,7 +196,7 @@ ARM_FUNC_START ffi_call_SYSV @ return INT cmp r3, #FFI_TYPE_INT -#ifdef __SOFTFP__ +#if defined(__SOFTFP__) || defined(__ARM_EABI__) cmpne r3, #FFI_TYPE_FLOAT #endif streq r0, [r2] @@ -197,12 +204,12 @@ ARM_FUNC_START ffi_call_SYSV @ return INT64 cmp r3, #FFI_TYPE_SINT64 -#ifdef __SOFTFP__ +#if defined(__SOFTFP__) || defined(__ARM_EABI__) cmpne r3, #FFI_TYPE_DOUBLE #endif stmeqia r2, {r0, r1} -#ifndef __SOFTFP__ +#if !defined(__SOFTFP__) && !defined(__ARM_EABI__) beq LSYM(Lepilogue) @ return FLOAT @@ -245,21 +252,21 @@ ARM_FUNC_START ffi_closure_SYSV beq .Lretint cmp r0, #FFI_TYPE_FLOAT -#ifdef __SOFTFP__ +#if defined(__SOFTFP__) || defined(__ARM_EABI__) beq .Lretint #else beq .Lretfloat #endif cmp r0, #FFI_TYPE_DOUBLE -#ifdef __SOFTFP__ +#if defined(__SOFTFP__) || defined(__ARM_EABI__) beq .Lretlonglong #else beq .Lretdouble #endif cmp r0, #FFI_TYPE_LONGDOUBLE -#ifdef __SOFTFP__ +#if defined(__SOFTFP__) || defined(__ARM_EABI__) beq .Lretlonglong #else beq .Lretlongdouble @@ -278,7 +285,7 @@ ARM_FUNC_START ffi_closure_SYSV ldr r1, [sp, #4] b .Lclosure_epilogue -#ifndef __SOFTFP__ +#if !defined(__SOFTFP__) && !defined(__ARM_EABI__) .Lretfloat: ldfs f0, [sp] b .Lclosure_epilogue |