about summary refs log tree commit diff
path: root/arch/arm/reloc.h
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-07-18 19:29:44 -0400
committerRich Felker <dalias@aerifal.cx>2013-07-18 19:29:44 -0400
commitf389c4984a0fee80c5322e4d1ec3aa207e9b5c01 (patch)
tree4d46e10d0503cb6c07caf1fa679eae4dc30a4ab5 /arch/arm/reloc.h
parent23815f88df6c45247f3755dc7857f4013264c04f (diff)
downloadmusl-f389c4984a0fee80c5322e4d1ec3aa207e9b5c01.tar.gz
musl-f389c4984a0fee80c5322e4d1ec3aa207e9b5c01.tar.xz
musl-f389c4984a0fee80c5322e4d1ec3aa207e9b5c01.zip
make the dynamic linker find its path file relative to its own location
prior to this change, using a non-default syslibdir was impractical on
systems where the ordinary library paths contain musl-incompatible
library files. the file containing search paths was always taken from
/etc, which would either correspond to a system-wide musl
installation, or fail to exist at all, resulting in searching of the
default library path.

the new search strategy is safe even for suid programs because the
pathname used comes from the PT_INTERP header of the program being
run, rather than any external input.

as part of this change, I have also begun differentiating the names of
arch variants that differ by endianness or floating point calling
convention. the corresponding changes in the build system and and gcc
wrapper script (to use an alternate dynamic linker name) for these
configurations have not yet been made.
Diffstat (limited to 'arch/arm/reloc.h')
-rw-r--r--arch/arm/reloc.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h
index b41314de..9ca0b48c 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)