re-fix vfprintf temporary buffer logic

[musl] / arch / arm / reloc.h

diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h
index dec0031..4b00bf6 100644 (file)
--- a/arch/arm/reloc.h
+++ b/arch/arm/reloc.h
@@ -6,17 +6,17 @@
 #define ENDIAN_SUFFIX ""
 #endif
 
-#if __SOFTFP__
-#define FP_SUFFIX ""
-#else
+#if __ARM_PCS_VFP
 #define FP_SUFFIX "hf"
+#else
+#define FP_SUFFIX ""
 #endif
 
 #define LDSO_ARCH "arm" ENDIAN_SUFFIX FP_SUFFIX
 
 #define NO_LEGACY_INITFINI
 
-#define TPOFF_K 8
+#define TPOFF_K 0
 
 #define REL_SYMBOLIC    R_ARM_ABS32
 #define REL_GOT         R_ARM_GLOB_DAT
@@ -29,4 +29,4 @@
 //#define REL_TLSDESC     R_ARM_TLS_DESC
 
 #define CRTJMP(pc,sp) __asm__ __volatile__( \
-       "mov sp,%1 ; tst %0,#1 ; moveq pc,%0 ; bx %0" : : "r"(pc), "r"(sp) : "memory" )
+       "mov sp,%1 ; bx %0" : : "r"(pc), "r"(sp) : "memory" )