5 files changed, 8 insertions, 3 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index b81c84092..4c61be223 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -202,6 +202,8 @@ static inline void hexprint(unsigned long x)
 }
 #endif
 
+LD_BOOT(unsigned long args) __attribute__ ((unused));
+
 LD_BOOT(unsigned long args)
 {
 	unsigned int argc;
diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h
index ee2832436..4e7f8b590 100644
--- a/ldso/ldso/sh/dl-sysdep.h
+++ b/ldso/ldso/sh/dl-sysdep.h
@@ -38,6 +38,8 @@
 			    - (unsigned long)(REL);		\
 		break;						\
 	case R_SH_DIR32:					\
+	case R_SH_GLOB_DAT:					\
+	case R_SH_JMP_SLOT:					\
 		*(REL)  = (SYMBOL) + (RELP)->r_addend;		\
 		break;						\
 	case R_SH_RELATIVE:					\
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c
index d94389ef7..734655075 100644
--- a/ldso/ldso/sh/elfinterp.c
+++ b/ldso/ldso/sh/elfinterp.c
@@ -288,8 +288,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
 			/* handled later on */
 			break;
 		case R_SH_DIR32:
-			*reloc_addr = symbol_addr + rpnt->r_addend;
-			break;
+		case R_SH_GLOB_DAT:
 		case R_SH_JMP_SLOT:
 			*reloc_addr = symbol_addr + rpnt->r_addend;
 			break;
diff --git a/ldso/ldso/sh/ld_sysdep.h b/ldso/ldso/sh/ld_sysdep.h
index ee2832436..4e7f8b590 100644
--- a/ldso/ldso/sh/ld_sysdep.h
+++ b/ldso/ldso/sh/ld_sysdep.h
@@ -38,6 +38,8 @@
 			    - (unsigned long)(REL);		\
 		break;						\
 	case R_SH_DIR32:					\
+	case R_SH_GLOB_DAT:					\
+	case R_SH_JMP_SLOT:					\
 		*(REL)  = (SYMBOL) + (RELP)->r_addend;		\
 		break;						\
 	case R_SH_RELATIVE:					\
diff --git a/ldso/ldso/sh/resolve.S b/ldso/ldso/sh/resolve.S
index 7fef6d77f..f3eac9b32 100644
--- a/ldso/ldso/sh/resolve.S
+++ b/ldso/ldso/sh/resolve.S
@@ -79,6 +79,6 @@ _dl_linux_resolve:
 
 	.balign	4
 3:
-	.long   _dl_linux_resolver - .jmp_loc
+	.long   _dl_linux_resolver@PLT-(.jmp_loc-(.))
 	.size	_dl_linux_resolve, . - _dl_linux_resolve