X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Farm%2Freloc.h;h=264b7ab2c4375a7fb7fc6d7b2114031f4114f57b;hb=1da53dad278f98b7712ac002162afaa8815ba580;hp=c37af07bb8d84f6cfdcb71f276bff12b79d3dc46;hpb=9c74856af78ac3e8aaa5f8b560e5022d2e6037d1;p=musl

diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h
index c37af07b..264b7ab2 100644
--- a/arch/arm/reloc.h
+++ b/arch/arm/reloc.h
@@ -1,7 +1,20 @@
 #include <string.h>
 #include <elf.h>
+#include <endian.h>
 
-#define ETC_LDSO_PATH "/etc/ld-musl-arm.path"
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define ENDIAN_SUFFIX "eb"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#if __SOFTFP__
+#define FP_SUFFIX ""
+#else
+#define FP_SUFFIX "hf"
+#endif
+
+#define LDSO_ARCH "arm" ENDIAN_SUFFIX FP_SUFFIX
 
 #define IS_COPY(x) ((x)==R_ARM_COPY)
 #define IS_PLT(x) ((x)==R_ARM_JUMP_SLOT)
@@ -34,8 +47,10 @@ static inline void do_single_reloc(
 		break;
 	case R_ARM_TLS_TPOFF32:
 		*reloc_addr += def.sym
-			? def.sym->st_value - def.dso->tls_offset
-			: 0 - self->tls_offset;
+			? def.sym->st_value + def.dso->tls_offset + 8
+			: self->tls_offset + 8;
 		break;
 	}
 }
+
+#define NO_LEGACY_INITFINI