From a5382c42bb58229b90b373efffc3a91a8e1bd044 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 3 May 2013 15:01:19 +0000 Subject: [PATCH] * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation): Only call lang_for_each_statement if an ELF hash table is used. --- ld/ChangeLog | 5 +++++ ld/emultempl/elf32.em | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 5bb24f966d4..7175c983439 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2013-05-03 Alan Modra + + * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation): + Only call lang_for_each_statement if an ELF hash table is used. + 2013-05-02 Nick Clifton * Makefile.am: Add emsp430X.c diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index dae86052ad4..251c5110823 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -1484,12 +1484,14 @@ gld${EMULATION_NAME}_before_allocation (void) bfd *abfd; if (is_elf_hash_table (link_info.hash)) - _bfd_elf_tls_setup (link_info.output_bfd, &link_info); + { + _bfd_elf_tls_setup (link_info.output_bfd, &link_info); - /* If we are going to make any variable assignments, we need to let - the ELF backend know about them in case the variables are - referred to by dynamic objects. */ - lang_for_each_statement (gld${EMULATION_NAME}_find_statement_assignment); + /* If we are going to make any variable assignments, we need to + let the ELF backend know about them in case the variables are + referred to by dynamic objects. */ + lang_for_each_statement (gld${EMULATION_NAME}_find_statement_assignment); + } /* Let the ELF backend work out the sizes of any sections required by dynamic linking. */ -- 2.30.2