diff options
| author | Alan Modra <amodra@gmail.com> | 2019-07-24 10:11:08 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-07-24 16:12:01 +0930 |
| commit | c5e20471be97e2dcd3498ac284487e2546715f66 (patch) | |
| tree | 891ed12d3c1be17fc82f02ef4d1e44e6fbee88ca /bfd | |
| parent | 7613ca5e3885b8e79d9096a53f3e5492a5c06cd7 (diff) | |
| download | gdb-c5e20471be97e2dcd3498ac284487e2546715f66.zip gdb-c5e20471be97e2dcd3498ac284487e2546715f66.tar.gz gdb-c5e20471be97e2dcd3498ac284487e2546715f66.tar.bz2 | |
Re: ELF final_write_processing
I missed some early exits from final_write_processing that mean
_bfd_elf_final_write_processing could be missed.
* elf-vxworks.c (elf_vxworks_final_write_processing): Don't return
early.
* elf32-arc.c (arc_elf_final_write_processing): Likewise.
* elf32-xtensa.c (elf_xtensa_final_write_processing): Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf-vxworks.c | 13 | ||||
| -rw-r--r-- | bfd/elf32-arc.c | 14 | ||||
| -rw-r--r-- | bfd/elf32-xtensa.c | 6 |
4 files changed, 20 insertions, 20 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a309957..1fe3860 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,12 @@ 2019-07-24 Alan Modra <amodra@gmail.com> + * elf-vxworks.c (elf_vxworks_final_write_processing): Don't return + early. + * elf32-arc.c (arc_elf_final_write_processing): Likewise. + * elf32-xtensa.c (elf_xtensa_final_write_processing): Likewise. + +2019-07-24 Alan Modra <amodra@gmail.com> + * elf32-visium.c (visium_elf_post_process_headers): Don't set EI_OSABI header byte here. (ELF_OSABI): Define. diff --git a/bfd/elf-vxworks.c b/bfd/elf-vxworks.c index 32eb5a9..4447b36 100644 --- a/bfd/elf-vxworks.c +++ b/bfd/elf-vxworks.c @@ -221,13 +221,14 @@ elf_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) sec = bfd_get_section_by_name (abfd, ".rel.plt.unloaded"); if (!sec) sec = bfd_get_section_by_name (abfd, ".rela.plt.unloaded"); - if (!sec) - return; - d = elf_section_data (sec); - d->this_hdr.sh_link = elf_onesymtab (abfd); - sec = bfd_get_section_by_name (abfd, ".plt"); if (sec) - d->this_hdr.sh_info = elf_section_data (sec)->this_idx; + { + d = elf_section_data (sec); + d->this_hdr.sh_link = elf_onesymtab (abfd); + sec = bfd_get_section_by_name (abfd, ".plt"); + if (sec) + d->this_hdr.sh_info = elf_section_data (sec)->this_idx; + } _bfd_elf_final_write_processing (abfd, linker); } diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c index ad5757a..fc4c3ae 100644 --- a/bfd/elf32-arc.c +++ b/bfd/elf32-arc.c @@ -1026,20 +1026,12 @@ arc_elf_final_write_processing (bfd *abfd, bfd_boolean linker) switch (bfd_get_mach (abfd)) { - case bfd_mach_arc_arc600: - emf = EM_ARC_COMPACT; - break; - case bfd_mach_arc_arc601: - emf = EM_ARC_COMPACT; - break; - case bfd_mach_arc_arc700: - emf = EM_ARC_COMPACT; - break; case bfd_mach_arc_arcv2: emf = EM_ARC_COMPACT2; break; default: - return; + emf = EM_ARC_COMPACT; + break; } elf_elfheader (abfd)->e_machine = emf; @@ -1050,7 +1042,7 @@ arc_elf_final_write_processing (bfd *abfd, bfd_boolean linker) else e_flags |= E_ARC_OSABI_V3; - elf_elfheader (abfd)->e_flags |= e_flags; + elf_elfheader (abfd)->e_flags |= e_flags; _bfd_elf_final_write_processing (abfd, linker); } diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index 66d23a8..40edb46 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -3466,7 +3466,7 @@ static void elf_xtensa_final_write_processing (bfd *abfd, bfd_boolean linker) { int mach; - unsigned long val; + unsigned long val = elf_elfheader (abfd)->e_flags & EF_XTENSA_MACH; switch (mach = bfd_get_mach (abfd)) { @@ -3474,10 +3474,10 @@ elf_xtensa_final_write_processing (bfd *abfd, bfd_boolean linker) val = E_XTENSA_MACH; break; default: - return; + break; } - elf_elfheader (abfd)->e_flags &= (~ EF_XTENSA_MACH); + elf_elfheader (abfd)->e_flags &= ~EF_XTENSA_MACH; elf_elfheader (abfd)->e_flags |= val; _bfd_elf_final_write_processing (abfd, linker); } |