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/__longjmp.S | |
| parent | a4ca51951804c14a5a8e331747649ca767bd8524 (diff) | |
| download | glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.tar.gz glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.tar.xz glibc-6dcf80c78273c5e0bdcacaf64a9b34fd930b405f.zip | |
Avoid VFP HWCAP check in setjmp/longjmp and getcontext/setcontext when compiled without __SOFTFP__ defined.
Diffstat (limited to 'ports/sysdeps/arm/__longjmp.S')
| -rw-r--r-- | ports/sysdeps/arm/__longjmp.S | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S index cc802c15bd..aa5cf74ad0 100644 --- a/ports/sysdeps/arm/__longjmp.S +++ b/ports/sysdeps/arm/__longjmp.S @@ -1,6 +1,5 @@ /* longjmp for ARM. - Copyright (C) 1997, 1998, 2005, 2006, 2009, 2010 - 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 @@ -48,26 +47,28 @@ ENTRY (__longjmp) cfi_restore (lr) #ifdef IS_IN_rtld - ldr a2, 1f - ldr a3, Lrtld_local_ro + ldr a2, 1f + ldr a3, .Lrtld_local_ro 0: add a2, pc, a2 add a2, a2, a3 ldr a2, [a2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] #else #ifdef PIC - ldr a2, 1f - ldr a3, Lrtld_global_ro + ldr a2, 1f + ldr a3, .Lrtld_global_ro 0: add a2, pc, a2 ldr a2, [a2, a3] ldr a2, [a2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] #else - ldr a2, Lhwcap + ldr a2, .Lhwcap ldr a2, [a2, #0] #endif #endif +#ifdef __SOFTFP__ tst a2, #HWCAP_ARM_VFP - beq Lno_vfp + beq .Lno_vfp +#endif /* Restore the VFP registers. */ /* Following instruction is vldmia ip!, {d8-d15}. */ @@ -76,10 +77,10 @@ ENTRY (__longjmp) ldr a3, [ip], #4 /* Following instruction is fmxr fpscr, a3. */ mcr p10, 7, a3, cr1, cr0, 0 -Lno_vfp: +.Lno_vfp: tst a2, #HWCAP_ARM_IWMMXT - beq Lno_iwmmxt + beq .Lno_iwmmxt /* Restore the call-preserved iWMMXt registers. */ /* Following instructions are wldrd wr10, [ip], #8 (etc.) */ @@ -89,21 +90,21 @@ Lno_vfp: ldcl p1, cr13, [r12], #8 ldcl p1, cr14, [r12], #8 ldcl p1, cr15, [r12], #8 -Lno_iwmmxt: +.Lno_iwmmxt: DO_RET(lr) #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 |