aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-08-11 04:44:00 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-08-11 04:44:00 +0000
commit1e840b2c6150838815c1041562f9876560b0b465 (patch)
treeb0a1359d6e917a4ca2d6abf94e5f525f99109352
parentbfc0f34e34c4278b49d70b7a20e1b87cbce0a710 (diff)
llvm-mc: Accept .word as a synonym for .short
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78641 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/MC/AsmParser/directive_values.s5
-rw-r--r--tools/llvm-mc/AsmParser.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/test/MC/AsmParser/directive_values.s b/test/MC/AsmParser/directive_values.s
index beac69a4ae..900fb7386d 100644
--- a/test/MC/AsmParser/directive_values.s
+++ b/test/MC/AsmParser/directive_values.s
@@ -19,3 +19,8 @@ TEST2:
# CHECK: .quad 9
TEST3:
.quad 9
+
+# CHECK: TEST4:
+# CHECK: .short 3
+TEST4:
+ .word 3
diff --git a/tools/llvm-mc/AsmParser.cpp b/tools/llvm-mc/AsmParser.cpp
index b766830bf1..eec4cc8829 100644
--- a/tools/llvm-mc/AsmParser.cpp
+++ b/tools/llvm-mc/AsmParser.cpp
@@ -517,7 +517,7 @@ bool AsmParser::ParseStatement() {
// FIXME: Target hooks for size? Also for "word", "hword".
if (IDVal == ".byte")
return ParseDirectiveValue(1);
- if (IDVal == ".short")
+ if (IDVal == ".short" || IDVal == ".word")
return ParseDirectiveValue(2);
if (IDVal == ".long")
return ParseDirectiveValue(4);