summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2008-11-19 10:09:21 +0000
committerNick Clifton <nickc@redhat.com>2008-11-19 10:09:21 +0000
commitc72830845bb1118b56a54b118ca56179bd0f05ac (patch)
tree191e0a3b032ef64f5a4a5b0e3c25a8b85cbc29d2
parentd2554705b4d6a6693882a9460c659b24aac7a46a (diff)
downloadbinutils-redhat-c72830845bb1118b56a54b118ca56179bd0f05ac.tar.gz
* elf.c (swap_out_syms) [USE_STT_COMMON]: Fix syntax error.
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/elf.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index dfbf47ac38..8377e1128a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-19 Nix <nix@esperi.org.uk>
+
+ * elf.c (swap_out_syms) [USE_STT_COMMON]: Fix syntax error.
+
2008-11-19 Nick Clifton <nickc@redhat.com>
PR 7027
diff --git a/bfd/elf.c b/bfd/elf.c
index 4525faab3b..70ed7656d0 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -6460,9 +6460,8 @@ Unable to find equivalent output section for symbol '%s' from section '%s'"),
if (type == STT_OBJECT)
sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_COMMON);
else
-#else
- sym.st_info = ELF_ST_INFO (STB_GLOBAL, type);
#endif
+ sym.st_info = ELF_ST_INFO (STB_GLOBAL, type);
}
else if (bfd_is_und_section (syms[idx]->section))
sym.st_info = ELF_ST_INFO (((flags & BSF_WEAK)