diff options
| author | Zhen Cao <zhen.cao@autodesk.com> | 2017-11-17 16:17:56 +0000 |
|---|---|---|
| committer | Zhen Cao <zhen.cao@autodesk.com> | 2017-11-17 16:17:56 +0000 |
| commit | ac358137f7395b4217eb65a1a860ed2eecf1d70e (patch) | |
| tree | e9372713277ff3eaddaf172af7f4e6c0ddb2aa80 /llvm | |
| parent | 0924094e347ed2bf3c6824f27931ec3571089e7b (diff) | |
| download | bcm5719-llvm-ac358137f7395b4217eb65a1a860ed2eecf1d70e.tar.gz bcm5719-llvm-ac358137f7395b4217eb65a1a860ed2eecf1d70e.zip | |
[MC] Fix regression tests on Windows when git “core.autocrlf” is set to true.
Differential Revision: https://reviews.llvm.org/D39737
llvm-svn: 318528
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/.gitattributes | 12 | ||||
| -rw-r--r-- | llvm/docs/GettingStartedVS.rst | 5 | ||||
| -rw-r--r-- | llvm/lib/MC/MCParser/AsmLexer.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/AsmParser/preserve-comments-crlf.s | 13 |
4 files changed, 32 insertions, 0 deletions
diff --git a/llvm/.gitattributes b/llvm/.gitattributes new file mode 100644 index 00000000000..e7d6fd6d93d --- /dev/null +++ b/llvm/.gitattributes @@ -0,0 +1,12 @@ +# binary files +test/Object/Inputs/*.a-* binary +test/tools/dsymutil/Inputs/* binary +test/tools/llvm-ar/Inputs/*.lib binary +test/tools/llvm-objdump/Inputs/*.a binary +test/tools/llvm-rc/Inputs/* binary +test/tools/llvm-strings/Inputs/numbers binary +test/MC/AsmParser/incbin_abcd binary +test/YAMLParser/spec-09-02.test binary + +# Windows line ending test +test/MC/AsmParser/preserve-comments-crlf.s text eol=crlf diff --git a/llvm/docs/GettingStartedVS.rst b/llvm/docs/GettingStartedVS.rst index 50f7aa123c5..a4ff2b822fc 100644 --- a/llvm/docs/GettingStartedVS.rst +++ b/llvm/docs/GettingStartedVS.rst @@ -76,6 +76,11 @@ Here's the short story for getting up and running quickly with LLVM: * With anonymous Subversion access: + *Note:* some regression tests require Unix-style line ending (``\n``). To + pass all regression tests, please add two lines *enable-auto-props = yes* + and *\* = svn:mime-type=application/octet-stream* to + ``C:\Users\<username>\AppData\Roaming\Subversion\config``. + 1. ``cd <where-you-want-llvm-to-live>`` 2. ``svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm`` 3. ``cd llvm`` diff --git a/llvm/lib/MC/MCParser/AsmLexer.cpp b/llvm/lib/MC/MCParser/AsmLexer.cpp index b83b6d3dcf6..74835fd70c0 100644 --- a/llvm/lib/MC/MCParser/AsmLexer.cpp +++ b/llvm/lib/MC/MCParser/AsmLexer.cpp @@ -210,6 +210,8 @@ AsmToken AsmLexer::LexLineComment() { int CurChar = getNextChar(); while (CurChar != '\n' && CurChar != '\r' && CurChar != EOF) CurChar = getNextChar(); + if (CurChar == '\r' && CurPtr != CurBuf.end() && *CurPtr == '\n') + ++CurPtr; // If we have a CommentConsumer, notify it about the comment. if (CommentConsumer) { diff --git a/llvm/test/MC/AsmParser/preserve-comments-crlf.s b/llvm/test/MC/AsmParser/preserve-comments-crlf.s new file mode 100644 index 00000000000..a0f50196213 --- /dev/null +++ b/llvm/test/MC/AsmParser/preserve-comments-crlf.s @@ -0,0 +1,13 @@ + #RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t + #RUN: diff %s %t + .text + +foo: #Comment here + #comment here + nop + #if DIRECTIVE COMMENT + ## WHOLE LINE COMMENT + cmpl $196, %eax ## EOL COMMENT + #endif + .ident "clang version 3.9.0" + .section ".note.GNU-stack","",@progbits |
