projects
/
external
/
binutils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0018b0a
)
* arm.cc (Target_arm::scan::global): Use || instead of |.
author
Ian Lance Taylor
<ian@airs.com>
Wed, 3 Jun 2009 14:05:07 +0000
(14:05 +0000)
committer
Ian Lance Taylor
<ian@airs.com>
Wed, 3 Jun 2009 14:05:07 +0000
(14:05 +0000)
gold/ChangeLog
patch
|
blob
|
history
gold/arm.cc
patch
|
blob
|
history
diff --git
a/gold/ChangeLog
b/gold/ChangeLog
index
c638b8c
..
7689897
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
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
fd1aae5
..
8f4da12
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
// 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))
{
flags |= Symbol::FUNCTION_CALL;
if (gsym->needs_dynamic_reloc(flags))
{