[prelink] Add recent version of prelink

1 files changed, 305 insertions, 0 deletions

diff --git a/packages/prelink/prelink-20071009/arm_eabi.patch b/packages/prelink/prelink-20071009/arm_eabi.patch
new file mode 100644
index 0000000000..5656350d4a
--- /dev/null
+++ b/packages/prelink/prelink-20071009/arm_eabi.patch
@@ -0,0 +1,305 @@
+From 7244fbfa85bc874225cd91a797e94bca78697848 Mon Sep 17 00:00:00 2001
+From: Holger Freyther <ich@tamarin.(none)>
+Date: Sun, 12 Oct 2008 13:45:14 +0200
+Subject: [PATCH] ARM EABI patch from Openembedded? Taken from where?
+
+---
+ src/arch-arm.c |  177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 172 insertions(+), 5 deletions(-)
+
+diff --git a/src/arch-arm.c b/src/arch-arm.c
+index 6641e86..3080b0a 100644
+--- a/src/arch-arm.c
++++ b/src/arch-arm.c
+@@ -145,6 +145,26 @@ arm_prelink_rel (struct prelink_info *info, GElf_Rel *rel, GElf_Addr reladdr)
+       error (0, 0, "%s: R_ARM_PC24 relocs with non-zero addend should not be present in prelinked REL sections",
+ 	     dso->filename);
+       return 1;
++    /* DTPOFF32, DTPMOD32 and TPOFF32 is impossible to predict unless prelink
++       sets the rules.  Also for DTPOFF32/TPOFF32 there is REL->RELA problem.  */
++    case R_ARM_TLS_DTPOFF32:
++      if (dso->ehdr.e_type == ET_EXEC)
++	error (0, 0, "%s: R_ARM_TLS_DTPOFF32 relocs should not be present in prelinked ET_EXEC REL sections",
++	       dso->filename);
++      break;
++    case R_ARM_TLS_DTPMOD32:
++      if (dso->ehdr.e_type == ET_EXEC)
++	{
++	  error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?",
++		 dso->filename);
++	  return 1;
++	}
++      break;
++    case R_ARM_TLS_TPOFF32:
++      if (dso->ehdr.e_type == ET_EXEC)
++	error (0, 0, "%s: R_ARM_TLS_TPOFF32 relocs should not be present in prelinked ET_EXEC REL sections",
++	       dso->filename);
++      break;
+     case R_ARM_COPY:
+       if (dso->ehdr.e_type == ET_EXEC)
+ 	/* COPY relocs are handled specially in generic code.  */
+@@ -195,6 +215,25 @@ arm_prelink_rela (struct prelink_info *info, GElf_Rela *rela,
+       write_le32 (dso, rela->r_offset,
+ 		  (read_ule32 (dso, rela->r_offset) & 0xff000000) | val);
+       break;
++    case R_ARM_TLS_DTPOFF32:
++      if (dso->ehdr.e_type == ET_EXEC)
++	write_le32 (dso, rela->r_offset, value + rela->r_addend);
++      break;
++    /* DTPMOD32 and TPOFF32 are impossible to predict unless prelink
++       sets the rules.  */
++    case R_ARM_TLS_DTPMOD32:
++      if (dso->ehdr.e_type == ET_EXEC)
++	{
++	  error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?",
++		 dso->filename);
++	  return 1;
++	}
++      break;
++    case R_ARM_TLS_TPOFF32:
++      if (dso->ehdr.e_type == ET_EXEC && info->resolvetls)
++	write_le32 (dso, rela->r_offset,
++		    value + rela->r_addend + info->resolvetls->offset);
++      break;
+     case R_ARM_COPY:
+       if (dso->ehdr.e_type == ET_EXEC)
+ 	/* COPY relocs are handled specially in generic code.  */
+@@ -315,6 +354,7 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel,
+ {
+   GElf_Addr value;
+   struct prelink_conflict *conflict;
++  struct prelink_tls *tls;
+   GElf_Rela *ret;
+ 
+   if (GELF_R_TYPE (rel->r_info) == R_ARM_RELATIVE
+@@ -324,8 +364,32 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel,
+   conflict = prelink_conflict (info, GELF_R_SYM (rel->r_info),
+ 			       GELF_R_TYPE (rel->r_info));
+   if (conflict == NULL)
+-    return 0;
+-  value = conflict_lookup_value (conflict);
++    {
++      if (info->curtls == NULL)
++	return 0;
++      switch (GELF_R_TYPE (rel->r_info))
++	{
++	/* Even local DTPMOD and {D,}TPOFF relocs need conflicts.  */
++	case R_ARM_TLS_DTPMOD32:
++	case R_ARM_TLS_DTPOFF32:
++	case R_ARM_TLS_TPOFF32:
++	  break;
++	default:
++	  return 0;
++	}
++      value = 0;
++    }
++  else
++    {
++      /* DTPOFF32 wants to see only real conflicts, not lookups
++	 with reloc_class RTYPE_CLASS_TLS.  */
++      if (GELF_R_TYPE (rel->r_info) == R_ARM_TLS_DTPOFF32
++	  && conflict->lookup.tls == conflict->conflict.tls
++	  && conflict->lookupval == conflict->conflictval)
++	return 0;
++
++      value = conflict_lookup_value (conflict);
++    }
+   ret = prelink_conflict_add_rela (info);
+   if (ret == NULL)
+     return 1;
+@@ -342,6 +406,33 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel,
+       error (0, 0, "%s: R_ARM_%s relocs should not be present in prelinked REL sections",
+ 	     dso->filename, GELF_R_TYPE (rel->r_info) == R_ARM_ABS32 ? "ABS32" : "PC24");
+       return 1;
++    case R_ARM_TLS_DTPMOD32:
++    case R_ARM_TLS_DTPOFF32:
++    case R_ARM_TLS_TPOFF32:
++      if (conflict != NULL
++	  && (conflict->reloc_class != RTYPE_CLASS_TLS
++	      || conflict->lookup.tls == NULL))
++	{
++	  error (0, 0, "%s: R_ARM_TLS not resolving to STT_TLS symbol",
++		 dso->filename);
++	  return 1;
++	}
++      tls = conflict ? conflict->lookup.tls : info->curtls;
++      ret->r_info = GELF_R_INFO (0, R_ARM_ABS32);
++      switch (GELF_R_TYPE (rel->r_info))
++	{
++	case R_ARM_TLS_DTPMOD32:
++	  ret->r_addend = tls->modid;
++	  break;
++	case R_ARM_TLS_DTPOFF32:
++	  ret->r_addend = value + read_ule32 (dso, rel->r_offset);
++	  break;
++	case R_ARM_TLS_TPOFF32:
++	  ret->r_addend = value + read_ule32 (dso, rel->r_offset)
++			    + tls->offset;
++	  break;
++	}
++      break;
+     case R_ARM_COPY:
+       error (0, 0, "R_ARM_COPY should not be present in shared libraries");
+       return 1;
+@@ -359,6 +450,7 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info,
+ {
+   GElf_Addr value;
+   struct prelink_conflict *conflict;
++  struct prelink_tls *tls;
+   GElf_Rela *ret;
+   Elf32_Sword val;
+ 
+@@ -369,8 +461,32 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info,
+   conflict = prelink_conflict (info, GELF_R_SYM (rela->r_info),
+ 			       GELF_R_TYPE (rela->r_info));
+   if (conflict == NULL)
+-    return 0;
+-  value = conflict_lookup_value (conflict);
++    {
++      if (info->curtls == NULL)
++	return 0;
++      switch (GELF_R_TYPE (rela->r_info))
++	{
++	/* Even local DTPMOD and {D,}TPOFF relocs need conflicts.  */
++	case R_ARM_TLS_DTPMOD32:
++	case R_ARM_TLS_DTPOFF32:
++	case R_ARM_TLS_TPOFF32:
++	  break;
++	default:
++	  return 0;
++	}
++      value = 0;
++    }
++  else
++    {
++      /* DTPOFF32 wants to see only real conflicts, not lookups
++	 with reloc_class RTYPE_CLASS_TLS.  */
++      if (GELF_R_TYPE (rela->r_info) == R_ARM_TLS_DTPOFF32
++	  && conflict->lookup.tls == conflict->conflict.tls
++	  && conflict->lookupval == conflict->conflictval)
++	return 0;
++
++      value = conflict_lookup_value (conflict);
++    }
+   ret = prelink_conflict_add_rela (info);
+   if (ret == NULL)
+     return 1;
+@@ -398,6 +514,32 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info,
+     case R_ARM_COPY:
+       error (0, 0, "R_ARM_COPY should not be present in shared libraries");
+       return 1;
++    case R_ARM_TLS_DTPMOD32:
++    case R_ARM_TLS_DTPOFF32:
++    case R_ARM_TLS_TPOFF32:
++      if (conflict != NULL
++	  && (conflict->reloc_class != RTYPE_CLASS_TLS
++	      || conflict->lookup.tls == NULL))
++	{
++	  error (0, 0, "%s: R_386_TLS not resolving to STT_TLS symbol",
++		 dso->filename);
++	  return 1;
++	}
++      tls = conflict ? conflict->lookup.tls : info->curtls;
++      ret->r_info = GELF_R_INFO (0, R_ARM_ABS32);
++      switch (GELF_R_TYPE (rela->r_info))
++	{
++	case R_ARM_TLS_DTPMOD32:
++	  ret->r_addend = tls->modid;
++	  break;
++	case R_ARM_TLS_DTPOFF32:
++	  ret->r_addend = value + rela->r_addend;
++	  break;
++	case R_ARM_TLS_TPOFF32:
++	  ret->r_addend = value + rela->r_addend + tls->offset;
++	  break;
++	}
++      break;
+     default:
+       error (0, 0, "%s: Unknown arm relocation type %d", dso->filename,
+ 	     (int) GELF_R_TYPE (rela->r_info));
+@@ -418,6 +560,8 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel, GElf_Rela *rela)
+       abort ();
+     case R_ARM_RELATIVE:
+     case R_ARM_ABS32:
++    case R_ARM_TLS_TPOFF32:
++    case R_ARM_TLS_DTPOFF32:
+       rela->r_addend = (Elf32_Sword) read_ule32 (dso, rel->r_offset);
+       break;
+     case R_ARM_PC24:
+@@ -426,6 +570,7 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel, GElf_Rela *rela)
+       break;
+     case R_ARM_COPY:
+     case R_ARM_GLOB_DAT:
++    case R_ARM_TLS_DTPMOD32:
+       rela->r_addend = 0;
+       break;
+     }
+@@ -445,6 +590,8 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *rela, GElf_Rel *rel)
+       abort ();
+     case R_ARM_RELATIVE:
+     case R_ARM_ABS32:
++    case R_ARM_TLS_TPOFF32:
++    case R_ARM_TLS_DTPOFF32:
+       write_le32 (dso, rela->r_offset, rela->r_addend);
+       break;
+     case R_ARM_PC24:
+@@ -453,6 +600,7 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *rela, GElf_Rel *rel)
+ 		  | ((rela->r_addend >> 2) & 0xffffff));
+       break;
+     case R_ARM_GLOB_DAT:
++    case R_ARM_TLS_DTPMOD32:
+       write_le32 (dso, rela->r_offset, 0);
+       break;
+     }
+@@ -488,6 +636,15 @@ arm_need_rel_to_rela (DSO *dso, int first, int last)
+ 		/* FALLTHROUGH */
+ 	      case R_ARM_PC24:
+ 		return 1;
++	      case R_ARM_TLS_DTPOFF32:
++	      case R_ARM_TLS_TPOFF32:
++		/* In shared libraries {D,}TPOFF32 is changed always into
++		   conflicts, for executables we need to preserve
++		   original addend.  */
++		if (dso->ehdr.e_type == ET_EXEC) {
++		  return 1;
++		}
++		break;
+ 	      }
+ 	}
+     }
+@@ -614,6 +771,12 @@ arm_undo_prelink_rel (DSO *dso, GElf_Rel *rel, GElf_Addr reladdr)
+ 	return 0;
+       error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename);
+       return 1;
++    case R_ARM_TLS_DTPMOD32:
++      write_le32 (dso, rel->r_offset, 0);
++      break;
++    case R_ARM_TLS_DTPOFF32:
++    case R_ARM_TLS_TPOFF32:
++      break;
+     default:
+       error (0, 0, "%s: Unknown arm relocation type %d", dso->filename,
+ 	     (int) GELF_R_TYPE (rel->r_info));
+@@ -636,6 +799,10 @@ arm_reloc_class (int reloc_type)
+     {
+     case R_ARM_COPY: return RTYPE_CLASS_COPY;
+     case R_ARM_JUMP_SLOT: return RTYPE_CLASS_PLT;
++    case R_ARM_TLS_DTPMOD32:
++    case R_ARM_TLS_DTPOFF32:
++    case R_ARM_TLS_TPOFF32:
++      return RTYPE_CLASS_TLS;
+     default: return RTYPE_CLASS_VALID;
+     }
+ }
+@@ -648,7 +815,7 @@ PL_ARCH = {
+   .R_JMP_SLOT = R_ARM_JUMP_SLOT,
+   .R_COPY = R_ARM_COPY,
+   .R_RELATIVE = R_ARM_RELATIVE,
+-  .dynamic_linker = "/lib/ld-linux.so.2",
++  .dynamic_linker = "/lib/ld-linux.so.3",
+   .adjust_dyn = arm_adjust_dyn,
+   .adjust_rel = arm_adjust_rel,
+   .adjust_rela = arm_adjust_rela,
+-- 
+1.5.4.3
+