Add ia64 support. Various adjustments were made to existing targets to

cope with a few interface changes required by the ia64. In particular,
function pointers on ia64 need special treatment in rtld.

2 files changed, 16 insertions, 6 deletions

diff --git a/libexec/rtld-elf/alpha/reloc.c b/libexec/rtld-elf/alpha/reloc.c
index 823e388..7709589 100644
--- a/libexec/rtld-elf/alpha/reloc.c
+++ b/libexec/rtld-elf/alpha/reloc.c
@@ -239,7 +239,8 @@ reloc_jmpslots(Obj_Entry *obj)
 	    if (def == NULL)
 		return -1;
 	    reloc_jmpslot(where,
-	      (Elf_Addr)(defobj->relocbase + def->st_value));
+	      (Elf_Addr)(defobj->relocbase + def->st_value),
+	      defobj);
 	}
     } else {
 	const Elf_Rela *relalim;
@@ -258,7 +259,8 @@ reloc_jmpslots(Obj_Entry *obj)
 	    if (def == NULL)
 		return -1;
 	    reloc_jmpslot(where,
-	      (Elf_Addr)(defobj->relocbase + def->st_value));
+	      (Elf_Addr)(defobj->relocbase + def->st_value),
+	      defobj);
 	}
     }
     obj->jmpslots_done = true;
@@ -266,8 +268,8 @@ reloc_jmpslots(Obj_Entry *obj)
 }
 
 /* Fixup the jump slot at "where" to transfer control to "target". */
-void
-reloc_jmpslot(Elf_Addr *where, Elf_Addr target)
+Elf_Addr
+reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj)
 {
     Elf_Addr stubaddr;
 
@@ -339,7 +341,7 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr target)
 	     */
 	    if ((int32_t)delta != delta) {
 		dbg("  PLT stub too far from GOT to relocate");
-		return;
+		return target;
 	    }
 	    dhigh = delta - (int16_t)delta;
 	    if (dhigh != 0) {
@@ -389,6 +391,8 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr target)
 	__asm__ __volatile__("wmb" : : : "memory");
 	stubptr[0] = inst[0];
     }
+
+    return target;
 }
 
 /* Process an R_ALPHA_COPY relocation. */
diff --git a/libexec/rtld-elf/alpha/rtld_machdep.h b/libexec/rtld-elf/alpha/rtld_machdep.h
index 13921c4..a461deb 100644
--- a/libexec/rtld-elf/alpha/rtld_machdep.h
+++ b/libexec/rtld-elf/alpha/rtld_machdep.h
@@ -29,10 +29,16 @@
 #ifndef RTLD_MACHDEP_H
 #define RTLD_MACHDEP_H	1
 
+struct Struct_Obj_Entry;
+
 /* Return the address of the .dynamic section in the dynamic linker. */
 #define rtld_dynamic(obj)	(&_DYNAMIC)
 
-void reloc_jmpslot(Elf_Addr *, Elf_Addr);
+Elf_Addr reloc_jmpslot(Elf_Addr *, Elf_Addr,
+		       const struct Struct_Obj_Entry *obj);
+
+#define make_function_pointer(def, defobj) \
+	((defobj)->relocbase + (def)->st_value)
 
 /* Atomic operations. */
 int cmp0_and_store_int(volatile int *, int);