summaryrefslogtreecommitdiff
path: root/arch/aarch64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/aarch64')
-rw-r--r--arch/aarch64/crt_arch.h13
-rw-r--r--arch/aarch64/reloc.h38
2 files changed, 21 insertions, 30 deletions
diff --git a/arch/aarch64/crt_arch.h b/arch/aarch64/crt_arch.h
index 32066881..3a4b321e 100644
--- a/arch/aarch64/crt_arch.h
+++ b/arch/aarch64/crt_arch.h
@@ -1,9 +1,14 @@
__asm__(
-".global _start\n"
-".type _start,%function\n"
-"_start:\n"
+".global " START "\n"
+".type " START ",%function\n"
+START ":\n"
" mov x29, #0\n"
" mov x30, #0\n"
" mov x0, sp\n"
+".weak _DYNAMIC\n"
+".hidden _DYNAMIC\n"
+" adrp x1, _DYNAMIC\n"
+" add x1, x1, #:lo12:_DYNAMIC\n"
" and sp, x0, #-16\n"
-" b __cstart\n");
+" b " START "_c\n"
+);
diff --git a/arch/aarch64/reloc.h b/arch/aarch64/reloc.h
index e95ae9a8..1b0402bc 100644
--- a/arch/aarch64/reloc.h
+++ b/arch/aarch64/reloc.h
@@ -1,5 +1,3 @@
-#include <string.h>
-#include <elf.h>
#include <endian.h>
#if __BYTE_ORDER == __BIG_ENDIAN
@@ -14,27 +12,15 @@
#define TPOFF_K 16
-static int remap_rel(int type)
-{
- switch(type) {
- case R_AARCH64_ABS64:
- return REL_SYMBOLIC;
- case R_AARCH64_GLOB_DAT:
- return REL_GOT;
- case R_AARCH64_JUMP_SLOT:
- return REL_PLT;
- case R_AARCH64_RELATIVE:
- return REL_RELATIVE;
- case R_AARCH64_COPY:
- return REL_COPY;
- case R_AARCH64_TLS_DTPMOD64:
- return REL_DTPMOD;
- case R_AARCH64_TLS_DTPREL64:
- return REL_DTPOFF;
- case R_AARCH64_TLS_TPREL64:
- return REL_TPOFF;
- case R_AARCH64_TLSDESC:
- return REL_TLSDESC;
- }
- return 0;
-}
+#define REL_SYMBOLIC R_AARCH64_ABS64
+#define REL_GOT R_AARCH64_GLOB_DAT
+#define REL_PLT R_AARCH64_JUMP_SLOT
+#define REL_RELATIVE R_AARCH64_RELATIVE
+#define REL_COPY R_AARCH64_COPY
+#define REL_DTPMOD R_AARCH64_TLS_DTPMOD64
+#define REL_DTPOFF R_AARCH64_TLS_DTPREL64
+#define REL_TPOFF R_AARCH64_TLS_TPREL64
+#define REL_TLSDESC R_AARCH64_TLSDESC
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+ "mov sp,%1 ; bx %0" : : "r"(pc), "r"(sp) : "memory" )