summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2011-11-15 22:14:41 +0000
committerJim Grosbach <grosbach@apple.com>2011-11-15 22:14:41 +0000
commit8279c1828f62b56a22b70f615e96410fc9709d02 (patch)
treef92565d1de2187b7a84e9e9edd098d9093880b21
parent92f2183360a57185417b2f38e112eba02cba9969 (diff)
downloadbcm5719-llvm-8279c1828f62b56a22b70f615e96410fc9709d02.tar.gz
bcm5719-llvm-8279c1828f62b56a22b70f615e96410fc9709d02.zip
ARM accept an immediate offset in memory operands w/o the '#'.
llvm-svn: 144709
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 1535a7a7768..ede71da5757 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -3559,9 +3559,12 @@ parseMemory(SmallVectorImpl<MCParsedAsmOperand*> &Operands) {
}
// If we have a '#', it's an immediate offset, else assume it's a register
- // offset.
- if (Parser.getTok().is(AsmToken::Hash)) {
- Parser.Lex(); // Eat the '#'.
+ // offset. Be friendly and also accept a plain integer (without a leading
+ // hash) for gas compatibility.
+ if (Parser.getTok().is(AsmToken::Hash) ||
+ Parser.getTok().is(AsmToken::Integer)) {
+ if (Parser.getTok().is(AsmToken::Hash))
+ Parser.Lex(); // Eat the '#'.
E = Parser.getTok().getLoc();
bool isNegative = getParser().getTok().is(AsmToken::Minus);
OpenPOWER on IntegriCloud