aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/MC/MCAssembler.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-08-20 16:18:30 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-08-20 16:18:30 +0000
commitc30c7c493fc8c0678aa7faaa94bd4412895d9a9f (patch)
treee9f35198ff04c9b7fb13ed357b0fe14ceb0eec17 /llvm/lib/MC/MCAssembler.cpp
parent58195a2d746efbf5e2ab08977c62a50eb8f7ce40 (diff)
downloadllvm-c30c7c493fc8c0678aa7faaa94bd4412895d9a9f.zip
llvm-c30c7c493fc8c0678aa7faaa94bd4412895d9a9f.tar.gz
llvm-c30c7c493fc8c0678aa7faaa94bd4412895d9a9f.tar.bz2
Fix symbol value computation when part of the expression is weak.
This matches the behaviour of the gnu assembler and is part of fixing pr24486. llvm-svn: 245576
Diffstat (limited to 'llvm/lib/MC/MCAssembler.cpp')
-rw-r--r--llvm/lib/MC/MCAssembler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index 4ec81b3..09a27fe 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -137,7 +137,7 @@ static bool getSymbolOffsetImpl(const MCAsmLayout &Layout, const MCSymbol &S,
// If SD is a variable, evaluate it.
MCValue Target;
- if (!S.getVariableValue()->evaluateAsRelocatable(Target, &Layout, nullptr))
+ if (!S.getVariableValue()->evaluateAsValue(Target, Layout))
report_fatal_error("unable to evaluate offset for variable '" +
S.getName() + "'");