generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 509317a4: am a18af83b: Merge "Remove __ARM_HAVE_VFP."

Browse Source 
* commit '509317a4758fc7177ca2e7ca1151914cd7701268':
  Remove __ARM_HAVE_VFP.
This commit is contained in:
Elliott Hughes
2014-12-04 19:51:41 +00:00
committed by Android Git Automerger
parent 2876478074 509317a475
commit 50ebeec8b1
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libc/arch-arm/bionic/_setjmp.S
View File

@@ -59,14 +59,12 @@ ENTRY(_setjmp)
add r1, r0, #(_JB_CORE_BASE * 4) add r1, r0, #(_JB_CORE_BASE * 4)
stmia r1, {r4-r14} stmia r1, {r4-r14}
#ifdef __ARM_HAVE_VFP
/* Store floating-point registers */ /* Store floating-point registers */
add r1, r0, #(_JB_FLOAT_BASE * 4) add r1, r0, #(_JB_FLOAT_BASE * 4)
vstmia r1, {d8-d15} vstmia r1, {d8-d15}
/* Store floating-point state */ /* Store floating-point state */
fmrx r1, fpscr fmrx r1, fpscr
str r1, [r0, #(_JB_FLOAT_STATE * 4)] str r1, [r0, #(_JB_FLOAT_STATE * 4)]
#endif /* __ARM_HAVE_VFP */
mov r0, #0x00000000 mov r0, #0x00000000
bx lr bx lr
@@ -81,14 +79,12 @@ ENTRY(_longjmp)
teq r2, r3 teq r2, r3
bne botch bne botch
#ifdef __ARM_HAVE_VFP
/* Restore floating-point registers */ /* Restore floating-point registers */
add r2, r0, #(_JB_FLOAT_BASE * 4) add r2, r0, #(_JB_FLOAT_BASE * 4)
vldmia r2, {d8-d15} vldmia r2, {d8-d15}
/* Restore floating-point state */ /* Restore floating-point state */
ldr r2, [r0, #(_JB_FLOAT_STATE * 4)] ldr r2, [r0, #(_JB_FLOAT_STATE * 4)]
fmxr fpscr, r2 fmxr fpscr, r2
#endif /* __ARM_HAVE_VFP */
/* Restore core registers */ /* Restore core registers */
add r2, r0, #(_JB_CORE_BASE * 4) add r2, r0, #(_JB_CORE_BASE * 4)

8
libc/arch-arm/bionic/setjmp.S
View File

@@ -72,14 +72,12 @@ ENTRY(setjmp)
add r1, r0, #(_JB_CORE_BASE * 4) add r1, r0, #(_JB_CORE_BASE * 4)
stmia r1, {r4-r14} stmia r1, {r4-r14}
#ifdef __ARM_HAVE_VFP
/* Store floating-point registers */ /* Store floating-point registers */
add r1, r0, #(_JB_FLOAT_BASE * 4) add r1, r0, #(_JB_FLOAT_BASE * 4)
vstmia r1, {d8-d15} vstmia r1, {d8-d15}
/* Store floating-point state */ /* Store floating-point state */
fmrx r1, fpscr fmrx r1, fpscr
str r1, [r0, #(_JB_FLOAT_STATE * 4)] str r1, [r0, #(_JB_FLOAT_STATE * 4)]
#endif /* __ARM_HAVE_VFP */
mov r0, #0x00000000 mov r0, #0x00000000
bx lr bx lr
@@ -115,14 +113,12 @@ ENTRY(longjmp)
ldmfd sp!, {r0, r1, r14} ldmfd sp!, {r0, r1, r14}
.cfi_def_cfa_offset 0 .cfi_def_cfa_offset 0
#ifdef __ARM_HAVE_VFP
/* Restore floating-point registers */ /* Restore floating-point registers */
add r2, r0, #(_JB_FLOAT_BASE * 4) add r2, r0, #(_JB_FLOAT_BASE * 4)
vldmia r2, {d8-d15} vldmia r2, {d8-d15}
/* Restore floating-point state */ /* Restore floating-point state */
ldr r2, [r0, #(_JB_FLOAT_STATE * 4)] ldr r2, [r0, #(_JB_FLOAT_STATE * 4)]
fmxr fpscr, r2 fmxr fpscr, r2
#endif /* __ARM_HAVE_VFP */
/* Restore core registers */ /* Restore core registers */
add r2, r0, #(_JB_CORE_BASE * 4) add r2, r0, #(_JB_CORE_BASE * 4)
@@ -139,11 +135,7 @@ ENTRY(longjmp)
teq r0, #0x00000000 teq r0, #0x00000000
moveq r0, #0x00000001 moveq r0, #0x00000001
bx lr bx lr
#ifdef __ARM_26__
mov r15, r14 mov r15, r14
#else
mov r15, r14
#endif
/* validation failed, die die die. */ /* validation failed, die die die. */
botch: botch:

6
libc/arch-arm/include/machine/cpu-features.h
View File

@@ -53,12 +53,6 @@
# endif # endif
#endif #endif
/* define _ARM_HAVE_VFP if we have VFPv3
*/
#if __ARM_ARCH__ >= 7 && defined __VFP_FP__
# define __ARM_HAVE_VFP
#endif
/* define _ARM_HAVE_NEON for ARMv7 architecture if we support the /* define _ARM_HAVE_NEON for ARMv7 architecture if we support the
* Neon SIMD instruction set extensions. This also implies * Neon SIMD instruction set extensions. This also implies
* that VFPv3-D32 is supported. * that VFPv3-D32 is supported.