From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 3 Jun 2009 14:05:07 +0000 (+0000)
Subject: 	* arm.cc (Target_arm::scan::global): Use || instead of |.
X-Git-Tag: cgen-1_1-branchpoint~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07800fab6ed5c7c3de13ce703b2b32eb1a92ffd6;p=thirdparty%2Fbinutils-gdb.git

	* arm.cc (Target_arm::scan::global): Use || instead of |.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index c638b8cfb4d..7689897c904 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-03  Ian Lance Taylor  <iant@google.com>
+
+	* arm.cc (Target_arm::scan::global): Use || instead of |.
+
 2009-05-31  Mikolaj Zalewski  <mikolajz@google.com>
 
 	* incremental.cc (Incremental_inputs::report_command_line): Filter
diff --git a/gold/arm.cc b/gold/arm.cc
index fd1aae52864..8f4da126f28 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -943,7 +943,7 @@ Target_arm<big_endian>::Scan::global(const General_options&,
 	// Make a dynamic relocation if necessary.
 	int flags = Symbol::NON_PIC_REF;
 	if (gsym->type() == elfcpp::STT_FUNC
-	    | gsym->type() == elfcpp::STT_ARM_TFUNC)
+	    || gsym->type() == elfcpp::STT_ARM_TFUNC)
 	  flags |= Symbol::FUNCTION_CALL;
 	if (gsym->needs_dynamic_reloc(flags))
 	  {