summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-mc/AsmParser.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-01-19 06:22:22 +0000
committerChris Lattner <sabre@nondot.org>2010-01-19 06:22:22 +0000
commitab9cd3e132a86f99c8784c6025c6f55bb5cf2612 (patch)
treed6117bdb1899a8b8d192169b0fb4096e6c8b4c66 /llvm/tools/llvm-mc/AsmParser.cpp
parent795bfb72079709bf6913dec1cf5c1c456c5d1a02 (diff)
downloadbcm5719-llvm-ab9cd3e132a86f99c8784c6025c6f55bb5cf2612.tar.gz
bcm5719-llvm-ab9cd3e132a86f99c8784c6025c6f55bb5cf2612.zip
fix parsing .comm directives on systems which do not represent alignments
as a power of 2. This fixes MC/AsmParser/directive_comm.s llvm-svn: 93867
Diffstat (limited to 'llvm/tools/llvm-mc/AsmParser.cpp')
-rw-r--r--llvm/tools/llvm-mc/AsmParser.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/llvm/tools/llvm-mc/AsmParser.cpp b/llvm/tools/llvm-mc/AsmParser.cpp
index d4af4bd0df6..0e7c3443d5a 100644
--- a/llvm/tools/llvm-mc/AsmParser.cpp
+++ b/llvm/tools/llvm-mc/AsmParser.cpp
@@ -1278,6 +1278,13 @@ bool AsmParser::ParseDirectiveComm(bool IsLocal) {
Pow2AlignmentLoc = Lexer.getLoc();
if (ParseAbsoluteExpression(Pow2Alignment))
return true;
+
+ // If this target takes alignments in bytes (not log) validate and convert.
+ if (Lexer.getMAI().getAlignmentIsInBytes()) {
+ if (!isPowerOf2_64(Pow2Alignment))
+ return Error(Pow2AlignmentLoc, "alignment must be a power of 2");
+ Pow2Alignment = Log2_64(Pow2Alignment);
+ }
}
if (Lexer.isNot(AsmToken::EndOfStatement))
OpenPOWER on IntegriCloud