Convert a few upstream files back to their original DOS line endings.vendor/llvm/llvm-trunk-r256633

8 files changed, 203 insertions, 203 deletions

diff --git a/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h b/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
index e17c993d275b..f7910962a03f 100644
--- a/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
+++ b/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
@@ -1,59 +1,59 @@
-//===-- DWARFDebugMacro.h ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H
-#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/DataExtractor.h"
-#include "llvm/Support/Dwarf.h"
-
-namespace llvm {
-
-class raw_ostream;
-
-class DWARFDebugMacro {
-  /// A single macro entry within a macro list.
-  struct Entry {
-    /// The type of the macro entry.
-    uint32_t Type;
-    union {
-      /// The source line where the macro is defined.
-      uint64_t Line;
-      /// Vendor extension constant value.
-      uint64_t ExtConstant;
-    };
-
-    union {
-      /// The string (name, value) of the macro entry.
-      const char *MacroStr;
-      // An unsigned integer indicating the identity of the source file.
-      uint64_t File;
-      /// Vendor extension string.
-      const char *ExtStr;
-    };
-  };
-
-  typedef SmallVector<Entry, 4> MacroList;
-
-  /// A list of all the macro entries in the debug_macinfo section.
-  MacroList Macros;
-
-public:
-  DWARFDebugMacro() {}
-  /// Print the macro list found within the debug_macinfo section.
-  void dump(raw_ostream &OS) const;
-  /// Parse the debug_macinfo section accessible via the 'data' parameter.
-  void parse(DataExtractor data);
-};
-
-}
-
-#endif
+//===-- DWARFDebugMacro.h ---------------------------------------*- C++ -*-===//

+//

+//                     The LLVM Compiler Infrastructure

+//

+// This file is distributed under the University of Illinois Open Source

+// License. See LICENSE.TXT for details.

+//

+//===----------------------------------------------------------------------===//

+

+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H

+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H

+

+#include "llvm/ADT/SmallVector.h"

+#include "llvm/ADT/StringRef.h"

+#include "llvm/Support/DataExtractor.h"

+#include "llvm/Support/Dwarf.h"

+

+namespace llvm {

+

+class raw_ostream;

+

+class DWARFDebugMacro {

+  /// A single macro entry within a macro list.

+  struct Entry {

+    /// The type of the macro entry.

+    uint32_t Type;

+    union {

+      /// The source line where the macro is defined.

+      uint64_t Line;

+      /// Vendor extension constant value.

+      uint64_t ExtConstant;

+    };

+

+    union {

+      /// The string (name, value) of the macro entry.

+      const char *MacroStr;

+      // An unsigned integer indicating the identity of the source file.

+      uint64_t File;

+      /// Vendor extension string.

+      const char *ExtStr;

+    };

+  };

+

+  typedef SmallVector<Entry, 4> MacroList;

+

+  /// A list of all the macro entries in the debug_macinfo section.

+  MacroList Macros;

+

+public:

+  DWARFDebugMacro() {}

+  /// Print the macro list found within the debug_macinfo section.

+  void dump(raw_ostream &OS) const;

+  /// Parse the debug_macinfo section accessible via the 'data' parameter.

+  void parse(DataExtractor data);

+};

+

+}

+

+#endif

diff --git a/lib/DebugInfo/CodeView/Makefile b/lib/DebugInfo/CodeView/Makefile
index 70e2bd011429..535bc10b7442 100644
--- a/lib/DebugInfo/CodeView/Makefile
+++ b/lib/DebugInfo/CodeView/Makefile
@@ -1,14 +1,14 @@
-##===- lib/DebugInfo/CodeView/Makefile ---------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../../..
-LIBRARYNAME = LLVMDebugInfoCodeView
-BUILD_ARCHIVE := 1
-
-include $(LEVEL)/Makefile.common
+##===- lib/DebugInfo/CodeView/Makefile ---------------------*- Makefile -*-===##

+#

+#                     The LLVM Compiler Infrastructure

+#

+# This file is distributed under the University of Illinois Open Source

+# License. See LICENSE.TXT for details.

+#

+##===----------------------------------------------------------------------===##

+

+LEVEL = ../../..

+LIBRARYNAME = LLVMDebugInfoCodeView

+BUILD_ARCHIVE := 1

+

+include $(LEVEL)/Makefile.common

diff --git a/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp b/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp
index b825d4d25243..b6555fa6272e 100644
--- a/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp
+++ b/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp
@@ -1,103 +1,103 @@
-//===-- DWARFDebugMacro.cpp -----------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "SyntaxHighlighting.h"
-#include "llvm/DebugInfo/DWARF/DWARFDebugMacro.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/Dwarf.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace llvm;
-using namespace dwarf;
-using namespace syntax;
-
-void DWARFDebugMacro::dump(raw_ostream &OS) const {
-  unsigned IndLevel = 0;
-  for (const Entry &E : Macros) {
-    // There should not be DW_MACINFO_end_file when IndLevel is Zero. However,
-    // this check handles the case of corrupted ".debug_macinfo" section.
-    if (IndLevel > 0)
-      IndLevel -= (E.Type == DW_MACINFO_end_file);
-    // Print indentation.
-    for (unsigned I = 0; I < IndLevel; I++)
-      OS << "  ";
-    IndLevel += (E.Type == DW_MACINFO_start_file);
-
-    WithColor(OS, syntax::Macro).get() << MacinfoString(E.Type);
-    switch (E.Type) {
-    default:
-      // Got a corrupted ".debug_macinfo" section (invalid macinfo type).
-      break;
-    case DW_MACINFO_define:
-    case DW_MACINFO_undef:
-      OS << " - lineno: " << E.Line;
-      OS << " macro: " << E.MacroStr;
-      break;
-    case DW_MACINFO_start_file:
-      OS << " - lineno: " << E.Line;
-      OS << " filenum: " << E.File;
-      break;
-    case DW_MACINFO_end_file:
-      break;
-    case DW_MACINFO_vendor_ext:
-      OS << " - constant: " << E.ExtConstant;
-      OS << " string: " << E.ExtStr;
-      break;
-    }
-    OS << "\n";
-  }
-}
-
-void DWARFDebugMacro::parse(DataExtractor data) {
-  uint32_t Offset = 0;
-  while (data.isValidOffset(Offset)) {
-    // A macro list entry consists of:
-    Entry E;
-    // 1. Macinfo type
-    E.Type = data.getULEB128(&Offset);
-
-    if (E.Type == 0) {
-      // Reached end of ".debug_macinfo" section.
-      return;
-    }
-
-    switch (E.Type) {
-    default:
-      // Got a corrupted ".debug_macinfo" section (invalid macinfo type).
-      // Push the corrupted entry to the list and halt parsing.
-      E.Type = DW_MACINFO_invalid;
-      Macros.push_back(E);
-      return;
-    case DW_MACINFO_define:
-    case DW_MACINFO_undef:
-      // 2. Source line
-      E.Line = data.getULEB128(&Offset);
-      // 3. Macro string
-      E.MacroStr = data.getCStr(&Offset);
-      break;
-    case DW_MACINFO_start_file:
-      // 2. Source line
-      E.Line = data.getULEB128(&Offset);
-      // 3. Source file id
-      E.File = data.getULEB128(&Offset);
-      break;
-    case DW_MACINFO_end_file:
-      break;
-    case DW_MACINFO_vendor_ext:
-      // 2. Vendor extension constant
-      E.ExtConstant = data.getULEB128(&Offset);
-      // 3. Vendor extension string
-      E.ExtStr = data.getCStr(&Offset);
-      break;
-    }
-
-    Macros.push_back(E);
-  }
-}
+//===-- DWARFDebugMacro.cpp -----------------------------------------------===//

+//

+//                     The LLVM Compiler Infrastructure

+//

+// This file is distributed under the University of Illinois Open Source

+// License. See LICENSE.TXT for details.

+//

+//===----------------------------------------------------------------------===//

+

+#include "SyntaxHighlighting.h"

+#include "llvm/DebugInfo/DWARF/DWARFDebugMacro.h"

+#include "llvm/Support/Compiler.h"

+#include "llvm/Support/Dwarf.h"

+#include "llvm/Support/Format.h"

+#include "llvm/Support/raw_ostream.h"

+

+using namespace llvm;

+using namespace dwarf;

+using namespace syntax;

+

+void DWARFDebugMacro::dump(raw_ostream &OS) const {

+  unsigned IndLevel = 0;

+  for (const Entry &E : Macros) {

+    // There should not be DW_MACINFO_end_file when IndLevel is Zero. However,

+    // this check handles the case of corrupted ".debug_macinfo" section.

+    if (IndLevel > 0)

+      IndLevel -= (E.Type == DW_MACINFO_end_file);

+    // Print indentation.

+    for (unsigned I = 0; I < IndLevel; I++)

+      OS << "  ";

+    IndLevel += (E.Type == DW_MACINFO_start_file);

+

+    WithColor(OS, syntax::Macro).get() << MacinfoString(E.Type);

+    switch (E.Type) {

+    default:

+      // Got a corrupted ".debug_macinfo" section (invalid macinfo type).

+      break;

+    case DW_MACINFO_define:

+    case DW_MACINFO_undef:

+      OS << " - lineno: " << E.Line;

+      OS << " macro: " << E.MacroStr;

+      break;

+    case DW_MACINFO_start_file:

+      OS << " - lineno: " << E.Line;

+      OS << " filenum: " << E.File;

+      break;

+    case DW_MACINFO_end_file:

+      break;

+    case DW_MACINFO_vendor_ext:

+      OS << " - constant: " << E.ExtConstant;

+      OS << " string: " << E.ExtStr;

+      break;

+    }

+    OS << "\n";

+  }

+}

+

+void DWARFDebugMacro::parse(DataExtractor data) {

+  uint32_t Offset = 0;

+  while (data.isValidOffset(Offset)) {

+    // A macro list entry consists of:

+    Entry E;

+    // 1. Macinfo type

+    E.Type = data.getULEB128(&Offset);

+

+    if (E.Type == 0) {

+      // Reached end of ".debug_macinfo" section.

+      return;

+    }

+

+    switch (E.Type) {

+    default:

+      // Got a corrupted ".debug_macinfo" section (invalid macinfo type).

+      // Push the corrupted entry to the list and halt parsing.

+      E.Type = DW_MACINFO_invalid;

+      Macros.push_back(E);

+      return;

+    case DW_MACINFO_define:

+    case DW_MACINFO_undef:

+      // 2. Source line

+      E.Line = data.getULEB128(&Offset);

+      // 3. Macro string

+      E.MacroStr = data.getCStr(&Offset);

+      break;

+    case DW_MACINFO_start_file:

+      // 2. Source line

+      E.Line = data.getULEB128(&Offset);

+      // 3. Source file id

+      E.File = data.getULEB128(&Offset);

+      break;

+    case DW_MACINFO_end_file:

+      break;

+    case DW_MACINFO_vendor_ext:

+      // 2. Vendor extension constant

+      E.ExtConstant = data.getULEB128(&Offset);

+      // 3. Vendor extension string

+      E.ExtStr = data.getCStr(&Offset);

+      break;

+    }

+

+    Macros.push_back(E);

+  }

+}

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h b/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h
index 66e6b00a2bbf..1209f66d5fe1 100644
--- a/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h
+++ b/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h
@@ -1 +1 @@
-#define M4 Value4
+#define M4 Value4

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro.cc b/test/DebugInfo/Inputs/dwarfdump-macro.cc
index 5abcb255c6c7..42b2c6ab54ac 100644
--- a/test/DebugInfo/Inputs/dwarfdump-macro.cc
+++ b/test/DebugInfo/Inputs/dwarfdump-macro.cc
@@ -1,11 +1,11 @@
-#define M1 Value1
-#include "dwarfdump-macro.h"
-#define M2(x, y)   ((x)+(y)* Value2)
-
-// Built with GCC
-// $ mkdir -p /tmp/dbginfo
-// $ cp dwarfdump-macro.cc /tmp/dbginfo
-// $ cp dwarfdump-macro.h /tmp/dbginfo
-// $ cp dwarfdump-macro-cmd.h /tmp/dbginfo
-// $ cd /tmp/dbginfo
-// $ g++ -c -g3 -O0 -DM3=Value3 -include dwarfdump-macro-cmd.h dwarfdump-macro.cc -o <output>
+#define M1 Value1

+#include "dwarfdump-macro.h"

+#define M2(x, y)   ((x)+(y)* Value2)

+

+// Built with GCC

+// $ mkdir -p /tmp/dbginfo

+// $ cp dwarfdump-macro.cc /tmp/dbginfo

+// $ cp dwarfdump-macro.h /tmp/dbginfo

+// $ cp dwarfdump-macro-cmd.h /tmp/dbginfo

+// $ cd /tmp/dbginfo

+// $ g++ -c -g3 -O0 -DM3=Value3 -include dwarfdump-macro-cmd.h dwarfdump-macro.cc -o <output>

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro.h b/test/DebugInfo/Inputs/dwarfdump-macro.h
index 98f0206cb43f..75b35f0e4c22 100644
--- a/test/DebugInfo/Inputs/dwarfdump-macro.h
+++ b/test/DebugInfo/Inputs/dwarfdump-macro.h
@@ -1,5 +1,5 @@
-
-
-
-#undef M1
-#define M1 NewValue1
+

+

+

+#undef M1

+#define M1 NewValue1

diff --git a/test/MC/Hexagon/test.s b/test/MC/Hexagon/test.s
index 73b6d0a96c71..e60578e65930 100644
--- a/test/MC/Hexagon/test.s
+++ b/test/MC/Hexagon/test.s
@@ -1,4 +1,4 @@
-#RUN: llvm-mc -filetype=obj -triple=hexagon -mcpu=hexagonv60 %s
-
-{ vmem (r0 + #0) = v0
+#RUN: llvm-mc -filetype=obj -triple=hexagon -mcpu=hexagonv60 %s

+

+{ vmem (r0 + #0) = v0

   r0 = memw(r0) } 
\ No newline at end of file
diff --git a/test/MC/X86/X86_64-pku.s b/test/MC/X86/X86_64-pku.s
index 8f8b227fa0c2..5cb669d5d8fc 100644
--- a/test/MC/X86/X86_64-pku.s
+++ b/test/MC/X86/X86_64-pku.s
@@ -1,8 +1,8 @@
-// RUN: llvm-mc -triple x86_64-unknown-unknown -mattr=+pku --show-encoding < %s | FileCheck %s
-// CHECK: rdpkru
-// CHECK: encoding: [0x0f,0x01,0xee]
-   rdpkru
-
-// CHECK: wrpkru
-// CHECK: encoding: [0x0f,0x01,0xef]
+// RUN: llvm-mc -triple x86_64-unknown-unknown -mattr=+pku --show-encoding < %s | FileCheck %s

+// CHECK: rdpkru

+// CHECK: encoding: [0x0f,0x01,0xee]

+   rdpkru

+

+// CHECK: wrpkru

+// CHECK: encoding: [0x0f,0x01,0xef]

    wrpkru 
\ No newline at end of file