From 4cd6a4a5d7e49d54d53dcf4a6f3393d50bd88e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Wed, 4 Jun 2003 18:44:09 +0000
Subject: Import dietlibc 0.22 + other fixes for AMD64

---
 mdk-stage1/dietlibc/libdl/_dl_relocate.c | 96 ++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 mdk-stage1/dietlibc/libdl/_dl_relocate.c

(limited to 'mdk-stage1/dietlibc/libdl/_dl_relocate.c')

diff --git a/mdk-stage1/dietlibc/libdl/_dl_relocate.c b/mdk-stage1/dietlibc/libdl/_dl_relocate.c
new file mode 100644
index 000000000..e91e48ccf
--- /dev/null
+++ b/mdk-stage1/dietlibc/libdl/_dl_relocate.c
@@ -0,0 +1,96 @@
+#include "_dl_int.h"
+
+#include "_dl_rel.h"
+
+#if 0
+/*--- are other relocation types vital to shared objects ? ---*/
+
+  R_386_NONE		 0	/* No reloc */
+  R_386_32		 1	/* Direct 32 bit  */
+  R_386_COPY		 5	/* Copy symbol at runtime ?!? */
+  R_386_GLOB_DAT	 6	/* Create GOT entry */
+  R_386_JMP_SLOT	 7	/* Create PLT entry */
+  R_386_RELATIVE	 8	/* Adjust by program base */
+
+  R_ARM_NONE		 0	/* No reloc */
+  R_ARM_ABS32		 2	/* Direct 32 bit  */
+  R_ARM_COPY		20	/* Copy symbol at runtime */
+  R_ARM_GLOB_DAT	21	/* Create GOT entry */
+  R_ARM_JUMP_SLOT	22	/* Create PLT entry */
+  R_ARM_RELATIVE	23	/* Adjust by program base */
+
+#endif
+
+static int _dl_apply_relocate(struct _dl_handle*dh,_dl_rel_t*rel) {
+  int typ,ret=0;
+  Elf_Addr*loc;
+
+  loc=(Elf_Addr *)(dh->mem_base+rel->r_offset);
+
+#ifdef DEBUG
+#if 0
+  pf(__FUNCTION__); pf(": "); ph(ELF_R_TYPE(rel->r_info)); pf(" @ "); ph((unsigned long)loc);
+  pf(" preval "); ph(*(unsigned long*)loc); pf("\n");
+#endif
+#endif
+
+  typ=ELF_R_TYPE(rel->r_info);
+
+#ifdef __i386__
+  if (typ==R_386_32) {			/* 1 */
+    *loc=(unsigned long)(dh->mem_base+dh->dyn_sym_tab[ELF_R_SYM(rel->r_info)].st_value);
+  } else if (typ==R_386_COPY)  {	/* 5 */
+    int len=dh->dyn_sym_tab[ELF_R_SYM(rel->r_info)].st_size;
+#ifdef DEBUG
+    pf(__FUNCTION__); pf(": R_386_COPY !\n");
+#endif
+    memcpy(loc,(void*)(unsigned long)_dl_sym(dh,ELF_R_SYM(rel->r_info)),len);
+  } else if (typ==R_386_GLOB_DAT) {	/* 6 */
+    *loc=(unsigned long)_dl_sym(dh,ELF_R_SYM(rel->r_info));
+  } else if (typ==R_386_JMP_SLOT) {	/* 7 */
+    *loc+=(unsigned long)dh->mem_base;
+  } else if (typ==R_386_RELATIVE) {	/* 8 */
+    *loc+=(unsigned long)dh->mem_base;
+  } else if (typ==R_386_NONE) {		/* 0 */
+  } else
+    ret=1;
+#endif
+#ifdef __arm__
+  if (typ==R_ARM_ABS32) {		/*  2 */
+    *loc=(unsigned long)(dh->mem_base+dh->dyn_sym_tab[ELF_R_SYM(rel->r_info)].st_value);
+  } else if (typ==R_ARM_COPY)  {	/* 20 */
+    int len=dh->dyn_sym_tab[ELF_R_SYM(rel->r_info)].st_size;
+#ifdef DEBUG
+    pf(__FUNCTION__); pf(": R_ARM_COPY !\n");
+#endif
+    memcpy(loc,(void*)(unsigned long)_dl_sym(dh,ELF_R_SYM(rel->r_info)),len);
+  } else if (typ==R_ARM_GLOB_DAT) {	/* 21 */
+    *loc=(unsigned long)_dl_sym(dh,ELF_R_SYM(rel->r_info));
+  } else if (typ==R_ARM_JUMP_SLOT) {	/* 22 */
+    *loc+=(unsigned long)dh->mem_base;
+  } else if (typ==R_ARM_RELATIVE) {	/* 23 */
+    *loc+=(unsigned long)dh->mem_base;
+  } else if (typ==R_ARM_NONE) {		/*  0 */
+  } else
+    ret=1;
+#endif
+
+#ifdef DEBUG
+  pf(__FUNCTION__); pf(": @ "); ph((unsigned long)loc); pf(" val "); ph(*(unsigned long*)loc); pf("\n");
+#endif
+  return ret;
+}
+
+#ifdef __DIET_LD_SO__
+static
+#endif
+int _dl_relocate(struct _dl_handle*dh,_dl_rel_t *rel,int num) {
+  int i;
+  for (i=0;i<num;i++) {
+    if (_dl_apply_relocate(dh,rel+i)) {
+      _dl_error=4;
+      return 1;
+    }
+  }
+  return 0;
+}
-- 
cgit v1.2.1