projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add CLOCK_TAI (and CLOCK_SGI_CYCLE) clock ids to time.h
[musl]
/
arch
/
arm
/
reloc.h
diff --git
a/arch/arm/reloc.h
b/arch/arm/reloc.h
index
c37af07
..
264b7ab
100644
(file)
--- a/
arch/arm/reloc.h
+++ b/
arch/arm/reloc.h
@@
-1,7
+1,20
@@
#include <string.h>
#include <elf.h>
#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)
#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
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;
}
}
break;
}
}
+
+#define NO_LEGACY_INITFINI