Module Name:    src
Committed By:   rin
Date:           Mon Aug 28 01:52:30 UTC 2023

Modified Files:
        src/external/gpl3/binutils/dist/bfd: elf.c

Log Message:
binutils/bfd/elf.c: Dedup merge botch

This code segment had been moved from original location in
the upstream source, as a part of:

http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/binutils/dist/bfd/elf.c#rev1.12

It accidentally became duplicated during binutils 2.39 merge.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/binutils/dist/bfd/elf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/elf.c
diff -u src/external/gpl3/binutils/dist/bfd/elf.c:1.18 src/external/gpl3/binutils/dist/bfd/elf.c:1.19
--- src/external/gpl3/binutils/dist/bfd/elf.c:1.18	Thu Aug 17 06:49:27 2023
+++ src/external/gpl3/binutils/dist/bfd/elf.c	Mon Aug 28 01:52:30 2023
@@ -4796,10 +4796,6 @@ _bfd_elf_map_sections_to_segments (bfd *
       hdr_index = 0;
       writable = false;
       executable = false;
-      dynsec = bfd_get_section_by_name (abfd, ".dynamic");
-      if (dynsec != NULL
-	  && (dynsec->flags & SEC_LOAD) == 0)
-	dynsec = NULL;
 
       if ((abfd->flags & D_PAGED) == 0)
 	phdr_in_segment = false;

Reply via email to