From: phcoder <phcoder@debian>
Date: Sun, 2 Jan 2011 13:39:23 +0000 (+0100)
Subject: ltoff relocation support
X-Git-Tag: 2.00~1266^2~18^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daca6c5f45406137290e008ae0ef363624bc1887;p=thirdparty%2Fgrub.git

ltoff relocation support
---

diff --git a/grub-core/kern/ia64/dl.c b/grub-core/kern/ia64/dl.c
index 2b87577a4..24fa01b90 100644
--- a/grub-core/kern/ia64/dl.c
+++ b/grub-core/kern/ia64/dl.c
@@ -187,6 +187,10 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		 rel++)
 		switch (ELF_R_TYPE (rel->r_info))
 		  {
+		  case R_IA64_LTOFF22X:
+		  case R_IA64_LTOFF22:
+		    gp_size += 8;
+		    break;
 		  default: break;
 		  }
 	  }
@@ -275,6 +279,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		  case R_IA64_SEGREL64LSB:
 		    *(grub_uint64_t *) addr += value - rel->r_offset;
 		    break;
+		  case R_IA64_LTOFF22X:
+		  case R_IA64_LTOFF22:
+		    *gpptr = value;
+		    add_value_to_slot13_20 (addr, (gpptr - gp) * sizeof (grub_uint64_t), slot);
+		    gpptr++;
+		    break;
+
+		    /* We treat LTOFF22X as LTOFF22, so we can ignore LDXMOV.  */
+		  case R_IA64_LDXMOV:
+		    break;
 		  default:
 		    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 				       "this relocation (0x%x) is not implemented yet",