summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DIContext.h (renamed from llvm/include/llvm/DebugInfo/DIContext.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h (renamed from llvm/include/llvm/DebugInfo/DWARFAbbreviationDeclaration.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h (renamed from llvm/include/llvm/DebugInfo/DWARFAcceleratorTable.h)4
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h (renamed from llvm/include/llvm/DebugInfo/DWARFCompileUnit.h)2
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h (renamed from llvm/include/llvm/DebugInfo/DWARFContext.h)18
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugAbbrev.h)2
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugArangeSet.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugAranges.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugFrame.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugInfoEntry.h)6
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugLine.h)4
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugLoc.h)2
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h (renamed from llvm/include/llvm/DebugInfo/DWARFDebugRangeList.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h (renamed from llvm/include/llvm/DebugInfo/DWARFFormValue.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h (renamed from llvm/include/llvm/DebugInfo/DWARFRelocMap.h)0
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFSection.h (renamed from llvm/include/llvm/DebugInfo/DWARFSection.h)2
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h (renamed from llvm/include/llvm/DebugInfo/DWARFTypeUnit.h)2
-rw-r--r--llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h (renamed from llvm/include/llvm/DebugInfo/DWARFUnit.h)10
-rw-r--r--llvm/lib/DebugInfo/CMakeLists.txt21
-rw-r--r--llvm/lib/DebugInfo/DWARF/CMakeLists.txt19
-rw-r--r--llvm/lib/DebugInfo/DWARF/DIContext.cpp (renamed from llvm/lib/DebugInfo/DIContext.cpp)4
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp (renamed from llvm/lib/DebugInfo/DWARFAbbreviationDeclaration.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp (renamed from llvm/lib/DebugInfo/DWARFAcceleratorTable.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp (renamed from llvm/lib/DebugInfo/DWARFCompileUnit.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFContext.cpp (renamed from llvm/lib/DebugInfo/DWARFContext.cpp)6
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugAbbrev.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugArangeSet.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugAranges.cpp)8
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugFrame.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp)10
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugLine.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugLoc.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp (renamed from llvm/lib/DebugInfo/DWARFDebugRangeList.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp (renamed from llvm/lib/DebugInfo/DWARFFormValue.cpp)6
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp (renamed from llvm/lib/DebugInfo/DWARFTypeUnit.cpp)2
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp (renamed from llvm/lib/DebugInfo/DWARFUnit.cpp)6
-rw-r--r--llvm/lib/DebugInfo/DWARF/LLVMBuild.txt22
-rw-r--r--llvm/lib/DebugInfo/DWARF/Makefile14
-rw-r--r--llvm/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp (renamed from llvm/lib/DebugInfo/SyntaxHighlighting.cpp)0
-rw-r--r--llvm/lib/DebugInfo/DWARF/SyntaxHighlighting.h (renamed from llvm/lib/DebugInfo/SyntaxHighlighting.h)0
-rw-r--r--llvm/lib/DebugInfo/DWARF/module.modulemap1
-rw-r--r--llvm/lib/DebugInfo/LLVMBuild.txt8
-rw-r--r--llvm/lib/DebugInfo/Makefile9
-rw-r--r--llvm/lib/DebugInfo/module.modulemap1
-rw-r--r--llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp2
-rw-r--r--llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt2
-rw-r--r--llvm/lib/Makefile4
-rw-r--r--llvm/tools/dsymutil/CMakeLists.txt2
-rw-r--r--llvm/tools/dsymutil/DwarfLinker.cpp4
-rw-r--r--llvm/tools/dsymutil/LLVMBuild.txt2
-rw-r--r--llvm/tools/dsymutil/Makefile2
-rw-r--r--llvm/tools/lli/CMakeLists.txt2
-rw-r--r--llvm/tools/llvm-dwarfdump/CMakeLists.txt2
-rw-r--r--llvm/tools/llvm-dwarfdump/LLVMBuild.txt2
-rw-r--r--llvm/tools/llvm-dwarfdump/Makefile2
-rw-r--r--llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp2
-rw-r--r--llvm/tools/llvm-go/llvm-go.go2
-rw-r--r--llvm/tools/llvm-objdump/CMakeLists.txt2
-rw-r--r--llvm/tools/llvm-objdump/LLVMBuild.txt2
-rw-r--r--llvm/tools/llvm-objdump/MachODump.cpp2
-rw-r--r--llvm/tools/llvm-objdump/Makefile2
-rw-r--r--llvm/tools/llvm-rtdyld/CMakeLists.txt2
-rw-r--r--llvm/tools/llvm-rtdyld/Makefile2
-rw-r--r--llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp2
-rw-r--r--llvm/tools/llvm-symbolizer/CMakeLists.txt2
-rw-r--r--llvm/tools/llvm-symbolizer/LLVMSymbolize.h2
-rw-r--r--llvm/tools/llvm-symbolizer/Makefile2
-rw-r--r--llvm/unittests/DebugInfo/CMakeLists.txt2
-rw-r--r--llvm/unittests/DebugInfo/DWARFFormValueTest.cpp2
-rw-r--r--llvm/unittests/DebugInfo/Makefile2
70 files changed, 152 insertions, 111 deletions
diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DWARF/DIContext.h
index 622aa699c43..622aa699c43 100644
--- a/llvm/include/llvm/DebugInfo/DIContext.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DIContext.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFAbbreviationDeclaration.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
index bb05c302be9..bb05c302be9 100644
--- a/llvm/include/llvm/DebugInfo/DWARFAbbreviationDeclaration.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFAcceleratorTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
index 3fbc1c3b3c7..e34f096f95d 100644
--- a/llvm/include/llvm/DebugInfo/DWARFAcceleratorTable.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
@@ -8,8 +8,8 @@
//===----------------------------------------------------------------------===//
#include "llvm/ADT/SmallVector.h"
-#include "llvm/DebugInfo/DWARFFormValue.h"
-#include "llvm/DebugInfo/DWARFRelocMap.h"
+#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"
#include <cstdint>
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFCompileUnit.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
index dbf777cc71a..743f9c696e9 100644
--- a/llvm/include/llvm/DebugInfo/DWARFCompileUnit.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
@@ -10,7 +10,7 @@
#ifndef LLVM_LIB_DEBUGINFO_DWARFCOMPILEUNIT_H
#define LLVM_LIB_DEBUGINFO_DWARFCOMPILEUNIT_H
-#include "llvm/DebugInfo/DWARFUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFUnit.h"
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFContext.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h
index 82b5bb08847..6e0cb1f2c07 100644
--- a/llvm/include/llvm/DebugInfo/DWARFContext.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h
@@ -12,15 +12,15 @@
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SmallVector.h"
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/DWARFCompileUnit.h"
-#include "llvm/DebugInfo/DWARFDebugAranges.h"
-#include "llvm/DebugInfo/DWARFDebugFrame.h"
-#include "llvm/DebugInfo/DWARFDebugLine.h"
-#include "llvm/DebugInfo/DWARFDebugLoc.h"
-#include "llvm/DebugInfo/DWARFDebugRangeList.h"
-#include "llvm/DebugInfo/DWARFSection.h"
-#include "llvm/DebugInfo/DWARFTypeUnit.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugAranges.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugFrame.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
+#include "llvm/DebugInfo/DWARF/DWARFSection.h"
+#include "llvm/DebugInfo/DWARF/DWARFTypeUnit.h"
#include <vector>
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugAbbrev.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
index 6752df9cd72..21142089da6 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugAbbrev.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
@@ -10,7 +10,7 @@
#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGABBREV_H
#define LLVM_LIB_DEBUGINFO_DWARFDEBUGABBREV_H
-#include "llvm/DebugInfo/DWARFAbbreviationDeclaration.h"
+#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
#include <list>
#include <map>
#include <vector>
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugArangeSet.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
index 837a8e63469..837a8e63469 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugArangeSet.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugAranges.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
index 791f010a889..791f010a889 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugAranges.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugFrame.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h
index be925cbe751..be925cbe751 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugFrame.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugInfoEntry.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
index f05d64b6f34..1080327adad 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugInfoEntry.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h
@@ -11,9 +11,9 @@
#define LLVM_LIB_DEBUGINFO_DWARFDEBUGINFOENTRY_H
#include "llvm/ADT/SmallVector.h"
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/DWARFAbbreviationDeclaration.h"
-#include "llvm/DebugInfo/DWARFDebugRangeList.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/Support/DataTypes.h"
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugLine.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
index c5ee76e3968..0c564c49f62 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugLine.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h
@@ -10,8 +10,8 @@
#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGLINE_H
#define LLVM_LIB_DEBUGINFO_DWARFDEBUGLINE_H
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/DWARFRelocMap.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"
#include "llvm/Support/DataExtractor.h"
#include <map>
#include <string>
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugLoc.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h
index a6135a0c929..bd44c2e5aab 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugLoc.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h
@@ -11,7 +11,7 @@
#define LLVM_LIB_DEBUGINFO_DWARFDEBUGLOC_H
#include "llvm/ADT/SmallVector.h"
-#include "llvm/DebugInfo/DWARFRelocMap.h"
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"
#include "llvm/Support/DataExtractor.h"
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFDebugRangeList.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
index 4ee3bdad329..4ee3bdad329 100644
--- a/llvm/include/llvm/DebugInfo/DWARFDebugRangeList.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFFormValue.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
index 5bb6d1b9ddb..5bb6d1b9ddb 100644
--- a/llvm/include/llvm/DebugInfo/DWARFFormValue.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFRelocMap.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
index d7fe3032e50..d7fe3032e50 100644
--- a/llvm/include/llvm/DebugInfo/DWARFRelocMap.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
diff --git a/llvm/include/llvm/DebugInfo/DWARFSection.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFSection.h
index 5f09d9e37d8..f52004cac8e 100644
--- a/llvm/include/llvm/DebugInfo/DWARFSection.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFSection.h
@@ -10,7 +10,7 @@
#ifndef LLVM_LIB_DEBUGINFO_DWARFSECTION_H
#define LLVM_LIB_DEBUGINFO_DWARFSECTION_H
-#include "llvm/DebugInfo/DWARFRelocMap.h"
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFTypeUnit.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
index 213b54139e0..f24e27819da 100644
--- a/llvm/include/llvm/DebugInfo/DWARFTypeUnit.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
@@ -10,7 +10,7 @@
#ifndef LLVM_LIB_DEBUGINFO_DWARFTYPEUNIT_H
#define LLVM_LIB_DEBUGINFO_DWARFTYPEUNIT_H
-#include "llvm/DebugInfo/DWARFUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFUnit.h"
namespace llvm {
diff --git a/llvm/include/llvm/DebugInfo/DWARFUnit.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h
index 0413a9431d1..ff6a4022ffc 100644
--- a/llvm/include/llvm/DebugInfo/DWARFUnit.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h
@@ -10,11 +10,11 @@
#ifndef LLVM_LIB_DEBUGINFO_DWARFUNIT_H
#define LLVM_LIB_DEBUGINFO_DWARFUNIT_H
-#include "llvm/DebugInfo/DWARFDebugAbbrev.h"
-#include "llvm/DebugInfo/DWARFDebugInfoEntry.h"
-#include "llvm/DebugInfo/DWARFDebugRangeList.h"
-#include "llvm/DebugInfo/DWARFRelocMap.h"
-#include "llvm/DebugInfo/DWARFSection.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"
+#include "llvm/DebugInfo/DWARF/DWARFSection.h"
#include <vector>
namespace llvm {
diff --git a/llvm/lib/DebugInfo/CMakeLists.txt b/llvm/lib/DebugInfo/CMakeLists.txt
index 4cce35b5ca1..ce8c0f8ef0b 100644
--- a/llvm/lib/DebugInfo/CMakeLists.txt
+++ b/llvm/lib/DebugInfo/CMakeLists.txt
@@ -1,19 +1,2 @@
-add_llvm_library(LLVMDebugInfo
- DIContext.cpp
- DWARFAbbreviationDeclaration.cpp
- DWARFAcceleratorTable.cpp
- DWARFCompileUnit.cpp
- DWARFContext.cpp
- DWARFDebugAbbrev.cpp
- DWARFDebugArangeSet.cpp
- DWARFDebugAranges.cpp
- DWARFDebugFrame.cpp
- DWARFDebugInfoEntry.cpp
- DWARFDebugLine.cpp
- DWARFDebugLoc.cpp
- DWARFDebugRangeList.cpp
- DWARFFormValue.cpp
- DWARFTypeUnit.cpp
- DWARFUnit.cpp
- SyntaxHighlighting.cpp
- )
+
+add_subdirectory(DWARF) \ No newline at end of file
diff --git a/llvm/lib/DebugInfo/DWARF/CMakeLists.txt b/llvm/lib/DebugInfo/DWARF/CMakeLists.txt
new file mode 100644
index 00000000000..2975581777a
--- /dev/null
+++ b/llvm/lib/DebugInfo/DWARF/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_llvm_library(LLVMDebugInfoDWARF
+ DIContext.cpp
+ DWARFAbbreviationDeclaration.cpp
+ DWARFAcceleratorTable.cpp
+ DWARFCompileUnit.cpp
+ DWARFContext.cpp
+ DWARFDebugAbbrev.cpp
+ DWARFDebugArangeSet.cpp
+ DWARFDebugAranges.cpp
+ DWARFDebugFrame.cpp
+ DWARFDebugInfoEntry.cpp
+ DWARFDebugLine.cpp
+ DWARFDebugLoc.cpp
+ DWARFDebugRangeList.cpp
+ DWARFFormValue.cpp
+ DWARFTypeUnit.cpp
+ DWARFUnit.cpp
+ SyntaxHighlighting.cpp
+ )
diff --git a/llvm/lib/DebugInfo/DIContext.cpp b/llvm/lib/DebugInfo/DWARF/DIContext.cpp
index 20bc01f8e71..a1c6ca4bd74 100644
--- a/llvm/lib/DebugInfo/DIContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DIContext.cpp
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
using namespace llvm;
DIContext::~DIContext() {}
diff --git a/llvm/lib/DebugInfo/DWARFAbbreviationDeclaration.cpp b/llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
index 2c9eff68b5b..9314c9eabc4 100644
--- a/llvm/lib/DebugInfo/DWARFAbbreviationDeclaration.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFAbbreviationDeclaration.h"
+#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/lib/DebugInfo/DWARFAcceleratorTable.cpp b/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
index cbdde6afbbc..8ae05432869 100644
--- a/llvm/lib/DebugInfo/DWARFAcceleratorTable.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFAcceleratorTable.h"
+#include "llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/lib/DebugInfo/DWARFCompileUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp
index 3ec2cf58e3f..01e724799ab 100644
--- a/llvm/lib/DebugInfo/DWARFCompileUnit.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFCompileUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/lib/DebugInfo/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index 3844cdea094..3b427007e59 100644
--- a/llvm/lib/DebugInfo/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -7,11 +7,11 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringSwitch.h"
-#include "llvm/DebugInfo/DWARFAcceleratorTable.h"
-#include "llvm/DebugInfo/DWARFDebugArangeSet.h"
+#include "llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h"
#include "llvm/Support/Compression.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Format.h"
diff --git a/llvm/lib/DebugInfo/DWARFDebugAbbrev.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp
index 6c9c9ebb74f..e63e28997ed 100644
--- a/llvm/lib/DebugInfo/DWARFDebugAbbrev.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugAbbrev.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
diff --git a/llvm/lib/DebugInfo/DWARFDebugArangeSet.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp
index d4bff90f656..67589cd01e5 100644
--- a/llvm/lib/DebugInfo/DWARFDebugArangeSet.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugArangeSet.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
diff --git a/llvm/lib/DebugInfo/DWARFDebugAranges.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp
index b825d83538c..27a02c4c50d 100644
--- a/llvm/lib/DebugInfo/DWARFDebugAranges.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp
@@ -7,10 +7,10 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugAranges.h"
-#include "llvm/DebugInfo/DWARFCompileUnit.h"
-#include "llvm/DebugInfo/DWARFContext.h"
-#include "llvm/DebugInfo/DWARFDebugArangeSet.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugAranges.h"
+#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
diff --git a/llvm/lib/DebugInfo/DWARFDebugFrame.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
index 968a0ce01c9..b7a0dd34290 100644
--- a/llvm/lib/DebugInfo/DWARFDebugFrame.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugFrame.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugFrame.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/Dwarf.h"
diff --git a/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
index 01ff52f3063..e963b7ca6e6 100644
--- a/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
@@ -8,11 +8,11 @@
//===----------------------------------------------------------------------===//
#include "SyntaxHighlighting.h"
-#include "llvm/DebugInfo/DWARFCompileUnit.h"
-#include "llvm/DebugInfo/DWARFContext.h"
-#include "llvm/DebugInfo/DWARFDebugAbbrev.h"
-#include "llvm/DebugInfo/DWARFDebugInfoEntry.h"
-#include "llvm/DebugInfo/DWARFFormValue.h"
+#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"
+#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Dwarf.h"
diff --git a/llvm/lib/DebugInfo/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
index 365a5220918..b63af6a64ee 100644
--- a/llvm/lib/DebugInfo/DWARFDebugLine.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugLine.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/Path.h"
diff --git a/llvm/lib/DebugInfo/DWARFDebugLoc.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp
index bc0133d209b..fdb6dd26b11 100644
--- a/llvm/lib/DebugInfo/DWARFDebugLoc.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugLoc.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Format.h"
diff --git a/llvm/lib/DebugInfo/DWARFDebugRangeList.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp
index ce60deb57ee..d5df6885f5e 100644
--- a/llvm/lib/DebugInfo/DWARFDebugRangeList.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFDebugRangeList.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/lib/DebugInfo/DWARFFormValue.cpp b/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp
index d784bfcb148..45bd1973a76 100644
--- a/llvm/lib/DebugInfo/DWARFFormValue.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp
@@ -10,9 +10,9 @@
#include "SyntaxHighlighting.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/DebugInfo/DWARFCompileUnit.h"
-#include "llvm/DebugInfo/DWARFContext.h"
-#include "llvm/DebugInfo/DWARFFormValue.h"
+#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Format.h"
diff --git a/llvm/lib/DebugInfo/DWARFTypeUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp
index 6e93e28b0a1..65c7bff0990 100644
--- a/llvm/lib/DebugInfo/DWARFTypeUnit.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFTypeUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFTypeUnit.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/lib/DebugInfo/DWARFUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
index 395a179f14b..d4ecd69e0ae 100644
--- a/llvm/lib/DebugInfo/DWARFUnit.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
@@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFUnit.h"
-#include "llvm/DebugInfo/DWARFContext.h"
-#include "llvm/DebugInfo/DWARFFormValue.h"
+#include "llvm/DebugInfo/DWARF/DWARFUnit.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Path.h"
#include <cstdio>
diff --git a/llvm/lib/DebugInfo/DWARF/LLVMBuild.txt b/llvm/lib/DebugInfo/DWARF/LLVMBuild.txt
new file mode 100644
index 00000000000..9f8b1047ef6
--- /dev/null
+++ b/llvm/lib/DebugInfo/DWARF/LLVMBuild.txt
@@ -0,0 +1,22 @@
+;===- ./lib/DebugInfo/DWARF/LLVMBuild.txt ----------------------*- Conf -*--===;
+;
+; The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+; http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Library
+name = DebugInfoDWARF
+parent = DebugInfo
+required_libraries = Object Support
diff --git a/llvm/lib/DebugInfo/DWARF/Makefile b/llvm/lib/DebugInfo/DWARF/Makefile
new file mode 100644
index 00000000000..863337353d0
--- /dev/null
+++ b/llvm/lib/DebugInfo/DWARF/Makefile
@@ -0,0 +1,14 @@
+##===- lib/DebugInfo/DWARF/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 = LLVMDebugInfoDWARF
+BUILD_ARCHIVE := 1
+
+include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/DebugInfo/SyntaxHighlighting.cpp b/llvm/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp
index a6b4c6549ca..a6b4c6549ca 100644
--- a/llvm/lib/DebugInfo/SyntaxHighlighting.cpp
+++ b/llvm/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp
diff --git a/llvm/lib/DebugInfo/SyntaxHighlighting.h b/llvm/lib/DebugInfo/DWARF/SyntaxHighlighting.h
index 946a31308aa..946a31308aa 100644
--- a/llvm/lib/DebugInfo/SyntaxHighlighting.h
+++ b/llvm/lib/DebugInfo/DWARF/SyntaxHighlighting.h
diff --git a/llvm/lib/DebugInfo/DWARF/module.modulemap b/llvm/lib/DebugInfo/DWARF/module.modulemap
new file mode 100644
index 00000000000..c2f624fd4b6
--- /dev/null
+++ b/llvm/lib/DebugInfo/DWARF/module.modulemap
@@ -0,0 +1 @@
+module DebugInfoDWARF { requires cplusplus umbrella "." module * { export * } }
diff --git a/llvm/lib/DebugInfo/LLVMBuild.txt b/llvm/lib/DebugInfo/LLVMBuild.txt
index f347d5ea32e..ab2185a8234 100644
--- a/llvm/lib/DebugInfo/LLVMBuild.txt
+++ b/llvm/lib/DebugInfo/LLVMBuild.txt
@@ -15,8 +15,10 @@
;
;===------------------------------------------------------------------------===;
+[common]
+subdirectories = DWARF
+
[component_0]
-type = Library
+type = Group
name = DebugInfo
-parent = Libraries
-required_libraries = Object Support
+parent = $ROOT
diff --git a/llvm/lib/DebugInfo/Makefile b/llvm/lib/DebugInfo/Makefile
index 1292b572835..9b4cb23690d 100644
--- a/llvm/lib/DebugInfo/Makefile
+++ b/llvm/lib/DebugInfo/Makefile
@@ -6,9 +6,10 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-
LEVEL = ../..
-LIBRARYNAME = LLVMDebugInfo
-BUILD_ARCHIVE := 1
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config
+
+PARALLEL_DIRS := DWARF
+
+include $(LEVEL)/Makefile.common \ No newline at end of file
diff --git a/llvm/lib/DebugInfo/module.modulemap b/llvm/lib/DebugInfo/module.modulemap
deleted file mode 100644
index 1fe5ab130fd..00000000000
--- a/llvm/lib/DebugInfo/module.modulemap
+++ /dev/null
@@ -1 +0,0 @@
-module DebugInfo { requires cplusplus umbrella "." module * { export * } }
diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp b/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
index ee9096b31e9..aa32452aedd 100644
--- a/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
+++ b/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
@@ -17,7 +17,7 @@
#include "IntelJITEventsWrapper.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
#include "llvm/ExecutionEngine/JITEventListener.h"
#include "llvm/IR/DebugInfo.h"
#include "llvm/IR/Function.h"
diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
index e36493ebbaf..1247cbd9493 100644
--- a/llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
+++ b/llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
@@ -21,4 +21,4 @@
type = OptionalLibrary
name = IntelJITEvents
parent = ExecutionEngine
-required_libraries = Core DebugInfo Support
+required_libraries = Core DebugInfoDWARF Support
diff --git a/llvm/lib/Makefile b/llvm/lib/Makefile
index 0ddf917599f..52fdaaf7e0f 100644
--- a/llvm/lib/Makefile
+++ b/llvm/lib/Makefile
@@ -10,8 +10,8 @@ LEVEL = ..
include $(LEVEL)/Makefile.config
-PARALLEL_DIRS := IR AsmParser Bitcode Analysis Transforms CodeGen Target \
- ExecutionEngine Linker LTO MC Object Option DebugInfo \
+PARALLEL_DIRS := IR AsmParser Bitcode Analysis Transforms CodeGen Target \
+ ExecutionEngine Linker LTO MC Object Option DebugInfo \
IRReader LineEditor ProfileData
include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/dsymutil/CMakeLists.txt b/llvm/tools/dsymutil/CMakeLists.txt
index c397e3ed36c..5e1f37f6fdd 100644
--- a/llvm/tools/dsymutil/CMakeLists.txt
+++ b/llvm/tools/dsymutil/CMakeLists.txt
@@ -1,5 +1,5 @@
set(LLVM_LINK_COMPONENTS
- DebugInfo
+ DebugInfoDWARF
Object
Support
)
diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index 7f6d69cc7de..62459b190b8 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -11,8 +11,8 @@
#include "BinaryHolder.h"
#include "DebugMap.h"
#include "dsymutil.h"
-#include "llvm/DebugInfo/DWARFContext.h"
-#include "llvm/DebugInfo/DWARFDebugInfoEntry.h"
+#include "llvm/DebugInfo/DWARF/DWARFContext.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"
#include <string>
namespace llvm {
diff --git a/llvm/tools/dsymutil/LLVMBuild.txt b/llvm/tools/dsymutil/LLVMBuild.txt
index dd9151e2b9a..c99529140c2 100644
--- a/llvm/tools/dsymutil/LLVMBuild.txt
+++ b/llvm/tools/dsymutil/LLVMBuild.txt
@@ -19,4 +19,4 @@
type = Tool
name = llvm-dsymutil
parent = Tools
-required_libraries = DebugInfo Object Support
+required_libraries = DebugInfoDWARF Object Support
diff --git a/llvm/tools/dsymutil/Makefile b/llvm/tools/dsymutil/Makefile
index fd437aa2ce3..e8dc5694634 100644
--- a/llvm/tools/dsymutil/Makefile
+++ b/llvm/tools/dsymutil/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llvm-dsymutil
-LINK_COMPONENTS := DebugInfo Object Support
+LINK_COMPONENTS := DebugInfoDWARF Object Support
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS := 1
diff --git a/llvm/tools/lli/CMakeLists.txt b/llvm/tools/lli/CMakeLists.txt
index 9217c382a98..0c2654be685 100644
--- a/llvm/tools/lli/CMakeLists.txt
+++ b/llvm/tools/lli/CMakeLists.txt
@@ -26,7 +26,7 @@ endif( LLVM_USE_OPROFILE )
if( LLVM_USE_INTEL_JITEVENTS )
set(LLVM_LINK_COMPONENTS
${LLVM_LINK_COMPONENTS}
- DebugInfo
+ DebugInfoDWARF
IntelJITEvents
Object
)
diff --git a/llvm/tools/llvm-dwarfdump/CMakeLists.txt b/llvm/tools/llvm-dwarfdump/CMakeLists.txt
index 288b3237010..086b1397461 100644
--- a/llvm/tools/llvm-dwarfdump/CMakeLists.txt
+++ b/llvm/tools/llvm-dwarfdump/CMakeLists.txt
@@ -1,5 +1,5 @@
set(LLVM_LINK_COMPONENTS
- DebugInfo
+ DebugInfoDWARF
Object
Support
)
diff --git a/llvm/tools/llvm-dwarfdump/LLVMBuild.txt b/llvm/tools/llvm-dwarfdump/LLVMBuild.txt
index 28b7c4cda48..a9dca3e0cff 100644
--- a/llvm/tools/llvm-dwarfdump/LLVMBuild.txt
+++ b/llvm/tools/llvm-dwarfdump/LLVMBuild.txt
@@ -19,4 +19,4 @@
type = Tool
name = llvm-dwarfdump
parent = Tools
-required_libraries = DebugInfo Object
+required_libraries = DebugInfoDWARF Object
diff --git a/llvm/tools/llvm-dwarfdump/Makefile b/llvm/tools/llvm-dwarfdump/Makefile
index 7ca1a8d877d..00b18c60bb2 100644
--- a/llvm/tools/llvm-dwarfdump/Makefile
+++ b/llvm/tools/llvm-dwarfdump/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llvm-dwarfdump
-LINK_COMPONENTS := DebugInfo Object
+LINK_COMPONENTS := DebugInfoDWARF Object
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS := 1
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index cff8216403b..a99f57f5037 100644
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -13,7 +13,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/Triple.h"
-#include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/RelocVisitor.h"
#include "llvm/Support/CommandLine.h"
diff --git a/llvm/tools/llvm-go/llvm-go.go b/llvm/tools/llvm-go/llvm-go.go
index cf520bd90e9..70d91d83893 100644
--- a/llvm/tools/llvm-go/llvm-go.go
+++ b/llvm/tools/llvm-go/llvm-go.go
@@ -46,7 +46,7 @@ var components = []string{
"bitwriter",
"codegen",
"core",
- "debuginfo",
+ "debuginfodwarf",
"executionengine",
"instrumentation",
"interpreter",
diff --git a/llvm/tools/llvm-objdump/CMakeLists.txt b/llvm/tools/llvm-objdump/CMakeLists.txt
index 61bf3b32757..d717653685c 100644
--- a/llvm/tools/llvm-objdump/CMakeLists.txt
+++ b/llvm/tools/llvm-objdump/CMakeLists.txt
@@ -1,6 +1,6 @@
set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
- DebugInfo
+ DebugInfoDWARF
MC
MCDisassembler
Object
diff --git a/llvm/tools/llvm-objdump/LLVMBuild.txt b/llvm/tools/llvm-objdump/LLVMBuild.txt
index d16c501a6cc..42328737a7d 100644
--- a/llvm/tools/llvm-objdump/LLVMBuild.txt
+++ b/llvm/tools/llvm-objdump/LLVMBuild.txt
@@ -19,4 +19,4 @@
type = Tool
name = llvm-objdump
parent = Tools
-required_libraries = DebugInfo MC MCDisassembler MCParser Object all-targets
+required_libraries = DebugInfoDWARF MC MCDisassembler MCParser Object all-targets
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index e103842e54f..c996fc26ef2 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -17,7 +17,7 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Config/config.h"
-#include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCDisassembler.h"
diff --git a/llvm/tools/llvm-objdump/Makefile b/llvm/tools/llvm-objdump/Makefile
index 4616b78adb2..7c165230dde 100644
--- a/llvm/tools/llvm-objdump/Makefile
+++ b/llvm/tools/llvm-objdump/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llvm-objdump
-LINK_COMPONENTS := all-targets DebugInfo MC MCParser MCDisassembler Object
+LINK_COMPONENTS := all-targets DebugInfoDWARF MC MCParser MCDisassembler Object
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS := 1
diff --git a/llvm/tools/llvm-rtdyld/CMakeLists.txt b/llvm/tools/llvm-rtdyld/CMakeLists.txt
index e294760801b..c1acbe5846b 100644
--- a/llvm/tools/llvm-rtdyld/CMakeLists.txt
+++ b/llvm/tools/llvm-rtdyld/CMakeLists.txt
@@ -1,6 +1,6 @@
set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
- DebugInfo
+ DebugInfoDWARF
ExecutionEngine
MC
Object
diff --git a/llvm/tools/llvm-rtdyld/Makefile b/llvm/tools/llvm-rtdyld/Makefile
index 9de753ef22a..3e868b98587 100644
--- a/llvm/tools/llvm-rtdyld/Makefile
+++ b/llvm/tools/llvm-rtdyld/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llvm-rtdyld
-LINK_COMPONENTS := all-targets support MC object RuntimeDyld MCJIT debuginfo
+LINK_COMPONENTS := all-targets support MC object RuntimeDyld MCJIT DebugInfoDWARF
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS := 1
diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
index 5b6f301994d..58bf206e5fd 100644
--- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/ADT/StringMap.h"
-#include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
#include "llvm/ExecutionEngine/RuntimeDyld.h"
#include "llvm/ExecutionEngine/RuntimeDyldChecker.h"
#include "llvm/MC/MCAsmInfo.h"
diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt
index 9e76248d83d..6968f1c6216 100644
--- a/llvm/tools/llvm-symbolizer/CMakeLists.txt
+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt
@@ -4,7 +4,7 @@
# targets as well. Currently, there is no support for such a build strategy.
set(LLVM_LINK_COMPONENTS
- DebugInfo
+ DebugInfoDWARF
Object
Support
)
diff --git a/llvm/tools/llvm-symbolizer/LLVMSymbolize.h b/llvm/tools/llvm-symbolizer/LLVMSymbolize.h
index ff848fceb24..c10922133f6 100644
--- a/llvm/tools/llvm-symbolizer/LLVMSymbolize.h
+++ b/llvm/tools/llvm-symbolizer/LLVMSymbolize.h
@@ -14,7 +14,7 @@
#define LLVM_TOOLS_LLVM_SYMBOLIZER_LLVMSYMBOLIZE_H
#include "llvm/ADT/SmallVector.h"
-#include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/DWARF/DIContext.h"
#include "llvm/Object/MachOUniversal.h"
#include "llvm/Object/ObjectFile.h"
#include "llvm/Support/DataExtractor.h"
diff --git a/llvm/tools/llvm-symbolizer/Makefile b/llvm/tools/llvm-symbolizer/Makefile
index 5ac83a58137..c5d2cf7659c 100644
--- a/llvm/tools/llvm-symbolizer/Makefile
+++ b/llvm/tools/llvm-symbolizer/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llvm-symbolizer
-LINK_COMPONENTS := DebugInfo Object
+LINK_COMPONENTS := DebugInfoDWARF Object
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS := 1
diff --git a/llvm/unittests/DebugInfo/CMakeLists.txt b/llvm/unittests/DebugInfo/CMakeLists.txt
index e844e95251a..ffc908608ab 100644
--- a/llvm/unittests/DebugInfo/CMakeLists.txt
+++ b/llvm/unittests/DebugInfo/CMakeLists.txt
@@ -1,5 +1,5 @@
set(LLVM_LINK_COMPONENTS
- DebugInfo
+ DebugInfoDWARF
)
set(DebugInfoSources
diff --git a/llvm/unittests/DebugInfo/DWARFFormValueTest.cpp b/llvm/unittests/DebugInfo/DWARFFormValueTest.cpp
index 38b932e3c9c..4521132de5e 100644
--- a/llvm/unittests/DebugInfo/DWARFFormValueTest.cpp
+++ b/llvm/unittests/DebugInfo/DWARFFormValueTest.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/DWARFFormValue.h"
+#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/Support/Dwarf.h"
#include "gtest/gtest.h"
using namespace llvm;
diff --git a/llvm/unittests/DebugInfo/Makefile b/llvm/unittests/DebugInfo/Makefile
index 999ded90b0f..ad3cb22bbd1 100644
--- a/llvm/unittests/DebugInfo/Makefile
+++ b/llvm/unittests/DebugInfo/Makefile
@@ -9,7 +9,7 @@
LEVEL = ../..
TESTNAME = DebugInfo
-LINK_COMPONENTS := debuginfo object support
+LINK_COMPONENTS := DebugInfoDWARF object support
include $(LEVEL)/Makefile.config
OpenPOWER on IntegriCloud