From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 29 Jun 2012 17:36:21 +0000 (+0000)
Subject: Simplify global symbol handling
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5abbdf3c1a08ac490b0abd9aa026a9e02952782;p=binutils-gdb.git

Simplify global symbol handling

	* archive.c (_bfd_compute_and_write_armap): Simplify global
	symbol handling.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1afd7e42ee0..9ea3a1e407e 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 26547bada11..062045263a1 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))
 		    {