aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-06-29 17:36:21 +0000
committerH.J. Lu <hjl.tools@gmail.com>2012-06-29 17:36:21 +0000
commitd5abbdf3c1a08ac490b0abd9aa026a9e02952782 (patch)
tree98a85bd946376893ee0704c3d404b52f39b71289 /bfd
parent6a1b08f5a6670f386c95a21c57068ae1b083e573 (diff)
downloadgdb-d5abbdf3c1a08ac490b0abd9aa026a9e02952782.zip
gdb-d5abbdf3c1a08ac490b0abd9aa026a9e02952782.tar.gz
gdb-d5abbdf3c1a08ac490b0abd9aa026a9e02952782.tar.bz2
Simplify global symbol handling
* archive.c (_bfd_compute_and_write_armap): Simplify global symbol handling.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/archive.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1afd7e4..9ea3a1e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-29 H.J. Lu <hongjiu.lu@intel.com>
+
+ * archive.c (_bfd_compute_and_write_armap): Simplify global
+ symbol handling.
+
2012-06-29 Nick Clifton <nickc@redhat.com>
PR ld/14189
diff --git a/bfd/archive.c b/bfd/archive.c
index 26547ba..0620452 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -2314,10 +2314,10 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength)
flagword flags = (syms[src_count])->flags;
asection *sec = syms[src_count]->section;
- if ((flags & BSF_GLOBAL
- || flags & BSF_WEAK
- || flags & BSF_INDIRECT
- || flags & BSF_GNU_UNIQUE
+ if (((flags & (BSF_GLOBAL
+ | BSF_WEAK
+ | BSF_INDIRECT
+ | BSF_GNU_UNIQUE)) != 0
|| bfd_is_com_section (sec))
&& ! bfd_is_und_section (sec))
{