From 6b0817e5ee38f926e56057ba30af0baf7e150fb2 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 3 Dec 2002 18:52:45 +0000 Subject: [PATCH] Fix typo in ChangeLog entry. Add paranoia checks to .PPC.EMB.apuinfo merging code. --- bfd/elf32-ppc.c | 8 +++++++- gas/ChangeLog | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index c117f54b200..7cb4d86312b 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -3901,6 +3901,9 @@ ppc_elf_begin_write_processing (abfd, link_info) unsigned long length; const char * error_message = NULL; + if (link_info == NULL) + return; + /* Scan the input bfds, looking for apuinfo sections. */ num_input_sections = 0; output_section_size = 0; @@ -4023,7 +4026,7 @@ ppc_elf_write_section (abfd, asec, contents) asection * asec; bfd_byte * contents ATTRIBUTE_UNUSED; { - return strcmp (asec->name, APUINFO_SECTION_NAME) == 0; + return apuinfo_list_length () && strcmp (asec->name, APUINFO_SECTION_NAME) == 0; } @@ -4044,6 +4047,9 @@ ppc_elf_final_write_processing (abfd, linker) if (asec == NULL) return; + if (apuinfo_list_length () == 0) + return; + length = asec->_raw_size; if (length < 20) return; diff --git a/gas/ChangeLog b/gas/ChangeLog index 5c59ad5c21a..7c4f230df22 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,7 +1,7 @@ 2002-12-03 Nick Clifton * config/tc-ppc.c (ppc_cleanup): Do not set SEC_MERGE flag on - .PPC.EMB>apuinfo sections. + .PPC.EMB.apuinfo sections. 2002-12-03 Richard Henderson -- 2.30.2