Fix: [MCParser] Correctly handle CRLF line ends when consuming line comments

Fixes an issue with revision 5c6f748c.

Move the test added in the above commit into the X86 folder, ensuring
that it is only run on targets where its triple is valid.

diff --git a/llvm/.gitattributes b/llvm/.gitattributes
index b41ae6a..8812053 100644 (file)
--- a/llvm/.gitattributes
+++ b/llvm/.gitattributes
@@ -17,4 +17,4 @@ test/YAMLParser/spec-09-02.test binary
 # binary and not autoconvert line endings (for example, when core.autocrlf is
 # on).
 test/MC/AsmParser/preserve-comments-crlf.s binary
-test/tools/llvm-mca/directives-handle-crlf.s binary
+test/tools/llvm-mca/X86/directives-handle-crlf.s binary

diff --git a/llvm/test/tools/llvm-mca/directives-handle-crlf.s b/llvm/test/tools/llvm-mca/X86/directives-handle-crlf.s
similarity index 96%
rename from llvm/test/tools/llvm-mca/directives-handle-crlf.s
rename to llvm/test/tools/llvm-mca/X86/directives-handle-crlf.s
index aa5c0fc..e62cdd2 100644 (file)
--- a/llvm/test/tools/llvm-mca/directives-handle-crlf.s
+++ b/llvm/test/tools/llvm-mca/X86/directives-handle-crlf.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mca -mtriple=x86_64-unknown-unknown %s\r
-# LLVM-MCA-BEGIN foo\r
-addl   $42, %eax\r
-# LLVM-MCA-END\r
+# RUN: llvm-mca -mtriple=x86_64-unknown-unknown %s
+# LLVM-MCA-BEGIN foo
+addl   $42, %eax
+# LLVM-MCA-END