From: amodra <amodra>
Date: Mon, 3 May 2004 14:52:01 +0000 (+0000)
Subject: 	* elf.c (_bfd_elf_rela_local_sym): Set kept_section for excluded
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a78d72448e9a77275a60db484ebd5c979ecda7f5;p=pf3gnuchains%2Fsourceware.git

	* elf.c (_bfd_elf_rela_local_sym): Set kept_section for excluded
	SEC_MERGE sections.
	* elflink.c (elf_link_input_bfd): Adjust output reloc index for
	those against discarded link-once and SEC_MERGE section symbols.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b5e5523768..e22588861f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_rela_local_sym): Set kept_section for excluded
+	SEC_MERGE sections.
+	* elflink.c (elf_link_input_bfd): Adjust output reloc index for
+	those against discarded link-once and SEC_MERGE section symbols.
+
 2004-05-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* section.c (bfd_get_section_by_name_if): New.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index a4adaf52f2..32f4264168 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -6763,13 +6763,10 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
 		    {
 		      /* I suppose the backend ought to fill in the
 			 section of any STT_SECTION symbol against a
-			 processor specific section.  If we have
-			 discarded a section, the output_section will
-			 be the absolute section.  */
-		      if (bfd_is_abs_section (sec)
-			  || (sec != NULL
-			      && bfd_is_abs_section (sec->output_section)))
-			r_symndx = 0;
+			 processor specific section.  */
+		      r_symndx = 0;
+		      if (bfd_is_abs_section (sec))
+			;
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);
@@ -6777,8 +6774,25 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
 			}
 		      else
 			{
-			  r_symndx = sec->output_section->target_index;
-			  BFD_ASSERT (r_symndx != 0);
+			  asection *osec = sec->output_section;
+
+			  /* If we have discarded a section, the output
+			     section will be the absolute section.  In
+			     case of discarded link-once and discarded
+			     SEC_MERGE sections, use the kept section.  */
+			  if (bfd_is_abs_section (osec)
+			      && sec->kept_section != NULL
+			      && sec->kept_section->output_section != NULL)
+			    {
+			      osec = sec->kept_section->output_section;
+			      irela->r_addend -= osec->vma;
+			    }
+
+			  if (!bfd_is_abs_section (osec))
+			    {
+			      r_symndx = osec->target_index;
+			      BFD_ASSERT (r_symndx != 0);
+			    }
 			}
 
 		      /* Adjust the addend according to where the