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 --git a/bfd/ChangeLog b/bfd/ChangeLog
index e3925af9225c164b7c41f088d66262152ca1e41d..de354fc50bec55cb48a993ffbc44eadbc7ae7afb 100644 (file)
--- 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 605720bff639ee3422c4f465bfabc1c795b3d9d4..d44009c4377a980915ec1f715eec478305dac741 100644 (file)
--- 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;
            }