From e8270241345074f3f75bc59203ee419894c3de77 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 17 Nov 2017 17:31:20 +0000 Subject: [PATCH] =?utf8?q?Revert=20"[MC]=20Fix=20regression=20tests=20on?= =?utf8?q?=20Windows=20when=20git=20=E2=80=9Ccore.autocrlf=E2=80=9D=20is?= =?utf8?q?=20set=20to=20true."?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit r318528. MC/AsmParser/preserve-comments-crlf.s fails on linux. llvm-svn: 318533 --- llvm/.gitattributes | 12 ------------ llvm/docs/GettingStartedVS.rst | 5 ----- llvm/lib/MC/MCParser/AsmLexer.cpp | 2 -- llvm/test/MC/AsmParser/preserve-comments-crlf.s | 13 ------------- 4 files changed, 32 deletions(-) delete mode 100644 llvm/.gitattributes delete mode 100644 llvm/test/MC/AsmParser/preserve-comments-crlf.s diff --git a/llvm/.gitattributes b/llvm/.gitattributes deleted file mode 100644 index e7d6fd6..0000000 --- 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 a4ff2b8..50f7aa1 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\\AppData\Roaming\Subversion\config``. - 1. ``cd `` 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 74835fd..b83b6d3 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 a0f5019..0000000 --- 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 -- 2.7.4