From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 27 Oct 2004 00:46:05 +0000 (+0000)
Subject: 2004-10-26  H.J. Lu  <hongjiu.lu@intel.com>
X-Git-Tag: csl-arm-2004-q3d~144
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97ecf3226de156edd6021981349357ea1094f1f8;p=external%2Fbinutils.git

2004-10-26  H.J. Lu  <hongjiu.lu@intel.com>

	PR 475
	* elfxx-ia64.c (elfNN_ia64_relocate_section): Correct
	R_IA64_SECREL32MSB, R_IA64_SECREL32LSB, R_IA64_SECREL64MSB
	and R_IA64_SECREL64LSB.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 12db6d7..7e9d085 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 475
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Correct
+	R_IA64_SECREL32MSB, R_IA64_SECREL32LSB, R_IA64_SECREL64MSB
+	and R_IA64_SECREL64LSB.
+
 2004-10-26  Paul Brook  <paul@codesourcery.com>
 
 	* elflink.c (elf_finalize_dynstr): Skip shared aux structure.
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index 917e2c3..a7d72bf 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -4338,11 +4338,9 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
 	case R_IA64_SECREL32LSB:
 	case R_IA64_SECREL64MSB:
 	case R_IA64_SECREL64LSB:
-	  /* Make output-section relative.  */
-	  if (value > input_section->output_section->vma)
-	    value -= input_section->output_section->vma;
-	  else
-	    value = 0;
+	  /* Make output-section relative to section where the symbol
+	     is defined. PR 475  */
+	  value -= sym_sec->output_section->vma;
 	  r = elfNN_ia64_install_value (hit_addr, value, r_type);
 	  break;