This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb/binutils-2_30-branch] IA-64: Fix linker error with --no-keep-memory.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=309c6330b67af549963b2b34986b2dd08baa5ba6

commit 309c6330b67af549963b2b34986b2dd08baa5ba6
Author: Jim Wilson <jimw@sifive.com>
Date:   Wed Feb 28 10:03:31 2018 -0800

    IA-64: Fix linker error with --no-keep-memory.
    
    	Import patch from mainline:
    	2018-02-26  Jim Wilson  <jimw@sifive.com>
    	Stephan Schreiber <info@fs-driver.org>
    
    	PR 15904
    	* elfnn-ia64.c (elfNN_ia64_relax_section): After ia64_elf_relax_brl
    	call, set changed_contents and changed_relocs.  Likewise after
    	successful ia64_elf_relax_br call.

Diff:
---
 bfd/ChangeLog    | 11 +++++++++++
 bfd/elfnn-ia64.c |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e3925af..de354fc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2018-02-28  Jim Wilson  <jimw@sifive.com>
+
+	Import patch from mainline:
+	2018-02-26  Jim Wilson  <jimw@sifive.com>
+	Stephan Schreiber <info@fs-driver.org>
+
+	PR 15904
+	* elfnn-ia64.c (elfNN_ia64_relax_section): After ia64_elf_relax_brl
+	call, set changed_contents and changed_relocs.  Likewise after
+	successful ia64_elf_relax_br call.
+
 2018-02-28  Nick Clifton  <nickc@redhat.com>
 
 	Import patch from the mainline:
diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index 605720b..d44009c 100644
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -593,6 +593,9 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec,
 		     1, change it to slot 2.  */
 		  if ((irel->r_offset & 3) == 1)
 		    irel->r_offset += 1;
+
+		  changed_contents = TRUE;
+		  changed_relocs = TRUE;
 		}
 
 	      continue;
@@ -607,6 +610,9 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec,
 
 	      /* Make the relocation offset point to slot 1.  */
 	      irel->r_offset = (irel->r_offset & ~((bfd_vma) 0x3)) + 1;
+
+	      changed_contents = TRUE;
+	      changed_relocs = TRUE;
 	      continue;
 	    }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]