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

diff --git a/gold/ChangeLog b/gold/ChangeLog
index c638b8cfb4d49b4c17c89f7c6e97241cdbf730a3..7689897c9042e124ae721bb73943a68ac0d2f6e0 100644 (file)
--- 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 fd1aae5286430159fd84d50dd66638ec09cd7a76..8f4da126f28aee28ba04af562bc8da8bbc72c789 100644 (file)
--- 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))
          {