about summary refs log tree commit diff
path: root/arch/sh
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-06-18 02:44:02 -0400
committerRich Felker <dalias@aerifal.cx>2014-06-18 02:44:02 -0400
commitadf94c19666e687a728bbf398f9a88ea4ea19996 (patch)
tree8393ad8b9c7db518d0351b36cccc4930614146f6 /arch/sh
parent94cf991bf4b18bb87a15a96e7b5e7d92fab787ba (diff)
downloadmusl-adf94c19666e687a728bbf398f9a88ea4ea19996.tar.gz
musl-adf94c19666e687a728bbf398f9a88ea4ea19996.tar.xz
musl-adf94c19666e687a728bbf398f9a88ea4ea19996.zip
refactor to remove arch-specific relocation code from dynamic linker
this was one of the main instances of ugly code duplication: all archs
use basically the same types of relocations, but roughly equivalent
logic was duplicated for each arch to account for the different naming
and numbering of relocation types and variation in whether REL or RELA
records are used.

as an added bonus, both REL and RELA are now supported on all archs,
regardless of which is used by the standard toolchain.
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/reloc.h38
1 files changed, 13 insertions, 25 deletions
diff --git a/arch/sh/reloc.h b/arch/sh/reloc.h
index 9090ee3b..aeb02d05 100644
--- a/arch/sh/reloc.h
+++ b/arch/sh/reloc.h
@@ -6,41 +6,29 @@
 
 #define LDSO_ARCH "sh" ENDIAN_SUFFIX
 
-#define IS_COPY(x) ((x) == R_SH_COPY)
-#define IS_PLT(x)  ((x) == R_SH_JMP_SLOT)
+#define TPOFF_K 8
 
-static inline int do_single_reloc(
-	struct dso *self, unsigned char *base_addr,
-	size_t *reloc_addr, int type, size_t addend,
-	Sym *sym, size_t sym_size,
-	struct symdef def, size_t sym_val)
+static int remap_rel(int type)
 {
 	switch(type) {
+	case R_SH_DIR32:
+		return REL_SYMBOLIC;
+	case R_SH_REL32:
+		return REL_OFFSET;
 	case R_SH_GLOB_DAT:
+		return REL_GOT;
 	case R_SH_JMP_SLOT:
-	case R_SH_DIR32:
-		*reloc_addr = sym_val + addend;
-		break;
+		return REL_PLT;
 	case R_SH_RELATIVE:
-		*reloc_addr = (size_t)base_addr + addend;
-		break;
-	case R_SH_REL32:
-		*reloc_addr = sym_val + addend - (size_t)reloc_addr;
-		break;
+		return REL_RELATIVE;
 	case R_SH_COPY:
-		memcpy(reloc_addr, (void *)sym_val, sym_size);
-		break;
+		return REL_COPY;
 	case R_SH_TLS_DTPMOD32:
-		*reloc_addr = def.dso ? def.dso->tls_id : self->tls_id;
-		break;
+		return REL_DTPMOD;
 	case R_SH_TLS_DTPOFF32:
-		*reloc_addr = def.sym->st_value + addend;
-		break;
+		return REL_DTPOFF;
 	case R_SH_TLS_TPOFF32:
-		*reloc_addr = (def.sym
-			? def.sym->st_value + def.dso->tls_offset
-			: self->tls_offset) + 8 + addend;
-		break;
+		return REL_TPOFF;
 	}
 	return 0;
 }