diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-09 11:51:05 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-09 11:51:05 -0700 |
| commit | 6dcf80c78273c5e0bdcacaf64a9b34fd930b405f (patch) | |
| tree | 138a528681e4d4cdce232291db14a58a91215004 /ports/sysdeps/arm/setjmp.S | |
| parent | a4ca51951804c14a5a8e331747649ca767bd8524 (diff) | |
| download | glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.tar glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.tar.gz glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.tar.bz2 glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.zip | |
Avoid VFP HWCAP check in setjmp/longjmp and getcontext/setcontext when compiled without __SOFTFP__ defined.
Diffstat (limited to 'ports/sysdeps/arm/setjmp.S')
| -rw-r--r-- | ports/sysdeps/arm/setjmp.S | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/ports/sysdeps/arm/setjmp.S b/ports/sysdeps/arm/setjmp.S index 5e3f39cc75..9bfacc1ab4 100644 --- a/ports/sysdeps/arm/setjmp.S +++ b/ports/sysdeps/arm/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for ARM. - Copyright (C) 1997, 1998, 2005, 2006, 2008 Free Software Foundation, Inc. + Copyright (C) 1997-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,25 +31,27 @@ ENTRY (__sigsetjmp) /* Check if we have a VFP unit. */ #ifdef IS_IN_rtld ldr a3, 1f - ldr a4, Lrtld_local_ro + ldr a4, .Lrtld_local_ro 0: add a3, pc, a3 add a3, a3, a4 ldr a3, [a3, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] #else #ifdef PIC ldr a3, 1f - ldr a4, Lrtld_global_ro + ldr a4, .Lrtld_global_ro 0: add a3, pc, a3 ldr a3, [a3, a4] ldr a3, [a3, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] #else - ldr a3, Lhwcap + ldr a3, .Lhwcap ldr a3, [a3, #0] #endif #endif +#ifdef __SOFTFP__ tst a3, #HWCAP_ARM_VFP - beq Lno_vfp + beq .Lno_vfp +#endif /* Store the VFP registers. Don't use VFP instructions directly because this code @@ -60,10 +62,10 @@ ENTRY (__sigsetjmp) /* Following instruction is vmrs a4, fpscr. */ mrc p10, 7, a4, cr1, cr0, 0 str a4, [ip], #4 -Lno_vfp: +.Lno_vfp: tst a3, #HWCAP_ARM_IWMMXT - beq Lno_iwmmxt + beq .Lno_iwmmxt /* Save the call-preserved iWMMXt registers. */ /* Following instructions are wstrd wr10, [ip], #8 (etc.) */ @@ -73,22 +75,22 @@ Lno_vfp: stcl p1, cr13, [r12], #8 stcl p1, cr14, [r12], #8 stcl p1, cr15, [r12], #8 -Lno_iwmmxt: +.Lno_iwmmxt: /* Make a tail call to __sigjmp_save; it takes the same args. */ B PLTJMP(C_SYMBOL_NAME(__sigjmp_save)) #ifdef IS_IN_rtld 1: .long _GLOBAL_OFFSET_TABLE_ - 0b - 8 -Lrtld_local_ro: +.Lrtld_local_ro: .long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF) #else #ifdef PIC 1: .long _GLOBAL_OFFSET_TABLE_ - 0b - 8 -Lrtld_global_ro: +.Lrtld_global_ro: .long C_SYMBOL_NAME(_rtld_global_ro)(GOT) #else -Lhwcap: +.Lhwcap: .long C_SYMBOL_NAME(_dl_hwcap) #endif #endif |