summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/.gitattributes12
-rw-r--r--llvm/docs/GettingStartedVS.rst5
-rw-r--r--llvm/lib/MC/MCParser/AsmLexer.cpp2
-rw-r--r--llvm/test/MC/AsmParser/preserve-comments-crlf.s13
4 files changed, 0 insertions, 32 deletions
diff --git a/llvm/.gitattributes b/llvm/.gitattributes
deleted file mode 100644
index e7d6fd6d93d..00000000000
--- a/llvm/.gitattributes
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 a4ff2b822fc..50f7aa123c5 100644
--- a/llvm/docs/GettingStartedVS.rst
+++ b/llvm/docs/GettingStartedVS.rst
@@ -76,11 +76,6 @@ 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 74835fd70c0..b83b6d3dcf6 100644
--- a/llvm/lib/MC/MCParser/AsmLexer.cpp
+++ b/llvm/lib/MC/MCParser/AsmLexer.cpp
@@ -210,8 +210,6 @@ 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
deleted file mode 100644
index a0f50196213..00000000000
--- a/llvm/test/MC/AsmParser/preserve-comments-crlf.s
+++ /dev/null
@@ -1,13 +0,0 @@
- #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
OpenPOWER on IntegriCloud