From 50418a0ac4926f481c6bc27618bbb1c591842513 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 30 Jan 2015 18:07:45 +0000 Subject: [PATCH] Move DebugInfo to DebugInfo/DWARF. In preparation for adding PDB support to LLVM, this moves the DWARF parsing code to its own subdirectory under DebugInfo, and renames LLVMDebugInfo to LLVMDebugInfoDWARF. This is purely a mechanical / build system change. Differential Revision: http://reviews.llvm.org/D7269 Reviewed by: Eric Christopher git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@227586 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../llvm/DebugInfo/{ => DWARF}/DIContext.h | 0 .../DWARFAbbreviationDeclaration.h | 0 .../{ => DWARF}/DWARFAcceleratorTable.h | 4 ++-- .../DebugInfo/{ => DWARF}/DWARFCompileUnit.h | 2 +- .../llvm/DebugInfo/{ => DWARF}/DWARFContext.h | 18 +++++++-------- .../DebugInfo/{ => DWARF}/DWARFDebugAbbrev.h | 2 +- .../{ => DWARF}/DWARFDebugArangeSet.h | 0 .../DebugInfo/{ => DWARF}/DWARFDebugAranges.h | 0 .../DebugInfo/{ => DWARF}/DWARFDebugFrame.h | 0 .../{ => DWARF}/DWARFDebugInfoEntry.h | 6 ++--- .../DebugInfo/{ => DWARF}/DWARFDebugLine.h | 4 ++-- .../DebugInfo/{ => DWARF}/DWARFDebugLoc.h | 2 +- .../{ => DWARF}/DWARFDebugRangeList.h | 0 .../DebugInfo/{ => DWARF}/DWARFFormValue.h | 0 .../DebugInfo/{ => DWARF}/DWARFRelocMap.h | 0 .../llvm/DebugInfo/{ => DWARF}/DWARFSection.h | 2 +- .../DebugInfo/{ => DWARF}/DWARFTypeUnit.h | 2 +- .../llvm/DebugInfo/{ => DWARF}/DWARFUnit.h | 10 ++++----- lib/DebugInfo/CMakeLists.txt | 21 ++---------------- lib/DebugInfo/DWARF/CMakeLists.txt | 19 ++++++++++++++++ lib/DebugInfo/{ => DWARF}/DIContext.cpp | 4 ++-- .../DWARFAbbreviationDeclaration.cpp | 2 +- .../{ => DWARF}/DWARFAcceleratorTable.cpp | 2 +- .../{ => DWARF}/DWARFCompileUnit.cpp | 2 +- lib/DebugInfo/{ => DWARF}/DWARFContext.cpp | 6 ++--- .../{ => DWARF}/DWARFDebugAbbrev.cpp | 2 +- .../{ => DWARF}/DWARFDebugArangeSet.cpp | 2 +- .../{ => DWARF}/DWARFDebugAranges.cpp | 8 +++---- lib/DebugInfo/{ => DWARF}/DWARFDebugFrame.cpp | 2 +- .../{ => DWARF}/DWARFDebugInfoEntry.cpp | 10 ++++----- lib/DebugInfo/{ => DWARF}/DWARFDebugLine.cpp | 2 +- lib/DebugInfo/{ => DWARF}/DWARFDebugLoc.cpp | 2 +- .../{ => DWARF}/DWARFDebugRangeList.cpp | 2 +- lib/DebugInfo/{ => DWARF}/DWARFFormValue.cpp | 6 ++--- lib/DebugInfo/{ => DWARF}/DWARFTypeUnit.cpp | 2 +- lib/DebugInfo/{ => DWARF}/DWARFUnit.cpp | 6 ++--- lib/DebugInfo/DWARF/LLVMBuild.txt | 22 +++++++++++++++++++ lib/DebugInfo/DWARF/Makefile | 14 ++++++++++++ .../{ => DWARF}/SyntaxHighlighting.cpp | 0 .../{ => DWARF}/SyntaxHighlighting.h | 0 lib/DebugInfo/DWARF/module.modulemap | 1 + lib/DebugInfo/LLVMBuild.txt | 8 ++++--- lib/DebugInfo/Makefile | 9 ++++---- lib/DebugInfo/module.modulemap | 1 - .../IntelJITEvents/IntelJITEventListener.cpp | 2 +- .../IntelJITEvents/LLVMBuild.txt | 2 +- lib/Makefile | 4 ++-- tools/dsymutil/CMakeLists.txt | 2 +- tools/dsymutil/DwarfLinker.cpp | 4 ++-- tools/dsymutil/LLVMBuild.txt | 2 +- tools/dsymutil/Makefile | 2 +- tools/lli/CMakeLists.txt | 2 +- tools/llvm-dwarfdump/CMakeLists.txt | 2 +- tools/llvm-dwarfdump/LLVMBuild.txt | 2 +- tools/llvm-dwarfdump/Makefile | 2 +- tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 2 +- tools/llvm-go/llvm-go.go | 2 +- tools/llvm-objdump/CMakeLists.txt | 2 +- tools/llvm-objdump/LLVMBuild.txt | 2 +- tools/llvm-objdump/MachODump.cpp | 2 +- tools/llvm-objdump/Makefile | 2 +- tools/llvm-rtdyld/CMakeLists.txt | 2 +- tools/llvm-rtdyld/Makefile | 2 +- tools/llvm-rtdyld/llvm-rtdyld.cpp | 2 +- tools/llvm-symbolizer/CMakeLists.txt | 2 +- tools/llvm-symbolizer/LLVMSymbolize.h | 2 +- tools/llvm-symbolizer/Makefile | 2 +- unittests/DebugInfo/CMakeLists.txt | 2 +- unittests/DebugInfo/DWARFFormValueTest.cpp | 2 +- unittests/DebugInfo/Makefile | 2 +- 70 files changed, 152 insertions(+), 111 deletions(-) rename include/llvm/DebugInfo/{ => DWARF}/DIContext.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFAbbreviationDeclaration.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFAcceleratorTable.h (92%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFCompileUnit.h (95%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFContext.h (96%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugAbbrev.h (96%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugArangeSet.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugAranges.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugFrame.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugInfoEntry.h (97%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugLine.h (98%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugLoc.h (97%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFDebugRangeList.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFFormValue.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFRelocMap.h (100%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFSection.h (91%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFTypeUnit.h (96%) rename include/llvm/DebugInfo/{ => DWARF}/DWARFUnit.h (97%) create mode 100644 lib/DebugInfo/DWARF/CMakeLists.txt rename lib/DebugInfo/{ => DWARF}/DIContext.cpp (84%) rename lib/DebugInfo/{ => DWARF}/DWARFAbbreviationDeclaration.cpp (97%) rename lib/DebugInfo/{ => DWARF}/DWARFAcceleratorTable.cpp (98%) rename lib/DebugInfo/{ => DWARF}/DWARFCompileUnit.cpp (95%) rename lib/DebugInfo/{ => DWARF}/DWARFContext.cpp (99%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugAbbrev.cpp (98%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugArangeSet.cpp (98%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugAranges.cpp (95%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugFrame.cpp (99%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugInfoEntry.cpp (98%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugLine.cpp (99%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugLoc.cpp (98%) rename lib/DebugInfo/{ => DWARF}/DWARFDebugRangeList.cpp (97%) rename lib/DebugInfo/{ => DWARF}/DWARFFormValue.cpp (99%) rename lib/DebugInfo/{ => DWARF}/DWARFTypeUnit.cpp (96%) rename lib/DebugInfo/{ => DWARF}/DWARFUnit.cpp (98%) create mode 100644 lib/DebugInfo/DWARF/LLVMBuild.txt create mode 100644 lib/DebugInfo/DWARF/Makefile rename lib/DebugInfo/{ => DWARF}/SyntaxHighlighting.cpp (100%) rename lib/DebugInfo/{ => DWARF}/SyntaxHighlighting.h (100%) create mode 100644 lib/DebugInfo/DWARF/module.modulemap delete mode 100644 lib/DebugInfo/module.modulemap diff --git a/include/llvm/DebugInfo/DIContext.h b/include/llvm/DebugInfo/DWARF/DIContext.h similarity index 100% rename from include/llvm/DebugInfo/DIContext.h rename to include/llvm/DebugInfo/DWARF/DIContext.h diff --git a/include/llvm/DebugInfo/DWARFAbbreviationDeclaration.h b/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h similarity index 100% rename from include/llvm/DebugInfo/DWARFAbbreviationDeclaration.h rename to include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h diff --git a/include/llvm/DebugInfo/DWARFAcceleratorTable.h b/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h similarity index 92% rename from include/llvm/DebugInfo/DWARFAcceleratorTable.h rename to include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h index 3fbc1c3b3c7..e34f096f95d 100644 --- a/include/llvm/DebugInfo/DWARFAcceleratorTable.h +++ b/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 namespace llvm { diff --git a/include/llvm/DebugInfo/DWARFCompileUnit.h b/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h similarity index 95% rename from include/llvm/DebugInfo/DWARFCompileUnit.h rename to include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h index dbf777cc71a..743f9c696e9 100644 --- a/include/llvm/DebugInfo/DWARFCompileUnit.h +++ b/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/include/llvm/DebugInfo/DWARFContext.h b/include/llvm/DebugInfo/DWARF/DWARFContext.h similarity index 96% rename from include/llvm/DebugInfo/DWARFContext.h rename to include/llvm/DebugInfo/DWARF/DWARFContext.h index 82b5bb08847..6e0cb1f2c07 100644 --- a/include/llvm/DebugInfo/DWARFContext.h +++ b/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 namespace llvm { diff --git a/include/llvm/DebugInfo/DWARFDebugAbbrev.h b/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h similarity index 96% rename from include/llvm/DebugInfo/DWARFDebugAbbrev.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h index 6752df9cd72..21142089da6 100644 --- a/include/llvm/DebugInfo/DWARFDebugAbbrev.h +++ b/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 #include #include diff --git a/include/llvm/DebugInfo/DWARFDebugArangeSet.h b/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h similarity index 100% rename from include/llvm/DebugInfo/DWARFDebugArangeSet.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h diff --git a/include/llvm/DebugInfo/DWARFDebugAranges.h b/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h similarity index 100% rename from include/llvm/DebugInfo/DWARFDebugAranges.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h diff --git a/include/llvm/DebugInfo/DWARFDebugFrame.h b/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h similarity index 100% rename from include/llvm/DebugInfo/DWARFDebugFrame.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h diff --git a/include/llvm/DebugInfo/DWARFDebugInfoEntry.h b/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h similarity index 97% rename from include/llvm/DebugInfo/DWARFDebugInfoEntry.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h index f05d64b6f34..1080327adad 100644 --- a/include/llvm/DebugInfo/DWARFDebugInfoEntry.h +++ b/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/include/llvm/DebugInfo/DWARFDebugLine.h b/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h similarity index 98% rename from include/llvm/DebugInfo/DWARFDebugLine.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugLine.h index c5ee76e3968..0c564c49f62 100644 --- a/include/llvm/DebugInfo/DWARFDebugLine.h +++ b/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 #include diff --git a/include/llvm/DebugInfo/DWARFDebugLoc.h b/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h similarity index 97% rename from include/llvm/DebugInfo/DWARFDebugLoc.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h index a6135a0c929..bd44c2e5aab 100644 --- a/include/llvm/DebugInfo/DWARFDebugLoc.h +++ b/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/include/llvm/DebugInfo/DWARFDebugRangeList.h b/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h similarity index 100% rename from include/llvm/DebugInfo/DWARFDebugRangeList.h rename to include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h diff --git a/include/llvm/DebugInfo/DWARFFormValue.h b/include/llvm/DebugInfo/DWARF/DWARFFormValue.h similarity index 100% rename from include/llvm/DebugInfo/DWARFFormValue.h rename to include/llvm/DebugInfo/DWARF/DWARFFormValue.h diff --git a/include/llvm/DebugInfo/DWARFRelocMap.h b/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h similarity index 100% rename from include/llvm/DebugInfo/DWARFRelocMap.h rename to include/llvm/DebugInfo/DWARF/DWARFRelocMap.h diff --git a/include/llvm/DebugInfo/DWARFSection.h b/include/llvm/DebugInfo/DWARF/DWARFSection.h similarity index 91% rename from include/llvm/DebugInfo/DWARFSection.h rename to include/llvm/DebugInfo/DWARF/DWARFSection.h index 5f09d9e37d8..f52004cac8e 100644 --- a/include/llvm/DebugInfo/DWARFSection.h +++ b/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/include/llvm/DebugInfo/DWARFTypeUnit.h b/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h similarity index 96% rename from include/llvm/DebugInfo/DWARFTypeUnit.h rename to include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h index 213b54139e0..f24e27819da 100644 --- a/include/llvm/DebugInfo/DWARFTypeUnit.h +++ b/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/include/llvm/DebugInfo/DWARFUnit.h b/include/llvm/DebugInfo/DWARF/DWARFUnit.h similarity index 97% rename from include/llvm/DebugInfo/DWARFUnit.h rename to include/llvm/DebugInfo/DWARF/DWARFUnit.h index 0413a9431d1..ff6a4022ffc 100644 --- a/include/llvm/DebugInfo/DWARFUnit.h +++ b/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 namespace llvm { diff --git a/lib/DebugInfo/CMakeLists.txt b/lib/DebugInfo/CMakeLists.txt index 4cce35b5ca1..ce8c0f8ef0b 100644 --- a/lib/DebugInfo/CMakeLists.txt +++ b/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/lib/DebugInfo/DWARF/CMakeLists.txt b/lib/DebugInfo/DWARF/CMakeLists.txt new file mode 100644 index 00000000000..2975581777a --- /dev/null +++ b/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/lib/DebugInfo/DIContext.cpp b/lib/DebugInfo/DWARF/DIContext.cpp similarity index 84% rename from lib/DebugInfo/DIContext.cpp rename to lib/DebugInfo/DWARF/DIContext.cpp index 20bc01f8e71..a1c6ca4bd74 100644 --- a/lib/DebugInfo/DIContext.cpp +++ b/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/lib/DebugInfo/DWARFAbbreviationDeclaration.cpp b/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp similarity index 97% rename from lib/DebugInfo/DWARFAbbreviationDeclaration.cpp rename to lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp index 2c9eff68b5b..9314c9eabc4 100644 --- a/lib/DebugInfo/DWARFAbbreviationDeclaration.cpp +++ b/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/lib/DebugInfo/DWARFAcceleratorTable.cpp b/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp similarity index 98% rename from lib/DebugInfo/DWARFAcceleratorTable.cpp rename to lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp index cbdde6afbbc..8ae05432869 100644 --- a/lib/DebugInfo/DWARFAcceleratorTable.cpp +++ b/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/lib/DebugInfo/DWARFCompileUnit.cpp b/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp similarity index 95% rename from lib/DebugInfo/DWARFCompileUnit.cpp rename to lib/DebugInfo/DWARF/DWARFCompileUnit.cpp index 3ec2cf58e3f..01e724799ab 100644 --- a/lib/DebugInfo/DWARFCompileUnit.cpp +++ b/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/lib/DebugInfo/DWARFContext.cpp b/lib/DebugInfo/DWARF/DWARFContext.cpp similarity index 99% rename from lib/DebugInfo/DWARFContext.cpp rename to lib/DebugInfo/DWARF/DWARFContext.cpp index 3844cdea094..3b427007e59 100644 --- a/lib/DebugInfo/DWARFContext.cpp +++ b/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/lib/DebugInfo/DWARFDebugAbbrev.cpp b/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp similarity index 98% rename from lib/DebugInfo/DWARFDebugAbbrev.cpp rename to lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp index 6c9c9ebb74f..e63e28997ed 100644 --- a/lib/DebugInfo/DWARFDebugAbbrev.cpp +++ b/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/lib/DebugInfo/DWARFDebugArangeSet.cpp b/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp similarity index 98% rename from lib/DebugInfo/DWARFDebugArangeSet.cpp rename to lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp index d4bff90f656..67589cd01e5 100644 --- a/lib/DebugInfo/DWARFDebugArangeSet.cpp +++ b/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 diff --git a/lib/DebugInfo/DWARFDebugAranges.cpp b/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp similarity index 95% rename from lib/DebugInfo/DWARFDebugAranges.cpp rename to lib/DebugInfo/DWARF/DWARFDebugAranges.cpp index b825d83538c..27a02c4c50d 100644 --- a/lib/DebugInfo/DWARFDebugAranges.cpp +++ b/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 diff --git a/lib/DebugInfo/DWARFDebugFrame.cpp b/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp similarity index 99% rename from lib/DebugInfo/DWARFDebugFrame.cpp rename to lib/DebugInfo/DWARF/DWARFDebugFrame.cpp index 968a0ce01c9..b7a0dd34290 100644 --- a/lib/DebugInfo/DWARFDebugFrame.cpp +++ b/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/lib/DebugInfo/DWARFDebugInfoEntry.cpp b/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp similarity index 98% rename from lib/DebugInfo/DWARFDebugInfoEntry.cpp rename to lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp index 01ff52f3063..e963b7ca6e6 100644 --- a/lib/DebugInfo/DWARFDebugInfoEntry.cpp +++ b/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/lib/DebugInfo/DWARFDebugLine.cpp b/lib/DebugInfo/DWARF/DWARFDebugLine.cpp similarity index 99% rename from lib/DebugInfo/DWARFDebugLine.cpp rename to lib/DebugInfo/DWARF/DWARFDebugLine.cpp index 365a5220918..b63af6a64ee 100644 --- a/lib/DebugInfo/DWARFDebugLine.cpp +++ b/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/lib/DebugInfo/DWARFDebugLoc.cpp b/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp similarity index 98% rename from lib/DebugInfo/DWARFDebugLoc.cpp rename to lib/DebugInfo/DWARF/DWARFDebugLoc.cpp index bc0133d209b..fdb6dd26b11 100644 --- a/lib/DebugInfo/DWARFDebugLoc.cpp +++ b/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/lib/DebugInfo/DWARFDebugRangeList.cpp b/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp similarity index 97% rename from lib/DebugInfo/DWARFDebugRangeList.cpp rename to lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp index ce60deb57ee..d5df6885f5e 100644 --- a/lib/DebugInfo/DWARFDebugRangeList.cpp +++ b/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/lib/DebugInfo/DWARFFormValue.cpp b/lib/DebugInfo/DWARF/DWARFFormValue.cpp similarity index 99% rename from lib/DebugInfo/DWARFFormValue.cpp rename to lib/DebugInfo/DWARF/DWARFFormValue.cpp index d784bfcb148..45bd1973a76 100644 --- a/lib/DebugInfo/DWARFFormValue.cpp +++ b/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/lib/DebugInfo/DWARFTypeUnit.cpp b/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp similarity index 96% rename from lib/DebugInfo/DWARFTypeUnit.cpp rename to lib/DebugInfo/DWARF/DWARFTypeUnit.cpp index 6e93e28b0a1..65c7bff0990 100644 --- a/lib/DebugInfo/DWARFTypeUnit.cpp +++ b/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/lib/DebugInfo/DWARFUnit.cpp b/lib/DebugInfo/DWARF/DWARFUnit.cpp similarity index 98% rename from lib/DebugInfo/DWARFUnit.cpp rename to lib/DebugInfo/DWARF/DWARFUnit.cpp index 395a179f14b..d4ecd69e0ae 100644 --- a/lib/DebugInfo/DWARFUnit.cpp +++ b/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 diff --git a/lib/DebugInfo/DWARF/LLVMBuild.txt b/lib/DebugInfo/DWARF/LLVMBuild.txt new file mode 100644 index 00000000000..9f8b1047ef6 --- /dev/null +++ b/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/lib/DebugInfo/DWARF/Makefile b/lib/DebugInfo/DWARF/Makefile new file mode 100644 index 00000000000..863337353d0 --- /dev/null +++ b/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/lib/DebugInfo/SyntaxHighlighting.cpp b/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp similarity index 100% rename from lib/DebugInfo/SyntaxHighlighting.cpp rename to lib/DebugInfo/DWARF/SyntaxHighlighting.cpp diff --git a/lib/DebugInfo/SyntaxHighlighting.h b/lib/DebugInfo/DWARF/SyntaxHighlighting.h similarity index 100% rename from lib/DebugInfo/SyntaxHighlighting.h rename to lib/DebugInfo/DWARF/SyntaxHighlighting.h diff --git a/lib/DebugInfo/DWARF/module.modulemap b/lib/DebugInfo/DWARF/module.modulemap new file mode 100644 index 00000000000..c2f624fd4b6 --- /dev/null +++ b/lib/DebugInfo/DWARF/module.modulemap @@ -0,0 +1 @@ +module DebugInfoDWARF { requires cplusplus umbrella "." module * { export * } } diff --git a/lib/DebugInfo/LLVMBuild.txt b/lib/DebugInfo/LLVMBuild.txt index f347d5ea32e..ab2185a8234 100644 --- a/lib/DebugInfo/LLVMBuild.txt +++ b/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/lib/DebugInfo/Makefile b/lib/DebugInfo/Makefile index 1292b572835..9b4cb23690d 100644 --- a/lib/DebugInfo/Makefile +++ b/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/lib/DebugInfo/module.modulemap b/lib/DebugInfo/module.modulemap deleted file mode 100644 index 1fe5ab130fd..00000000000 --- a/lib/DebugInfo/module.modulemap +++ /dev/null @@ -1 +0,0 @@ -module DebugInfo { requires cplusplus umbrella "." module * { export * } } diff --git a/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp b/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp index ee9096b31e9..aa32452aedd 100644 --- a/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp +++ b/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/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt b/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt index e36493ebbaf..1247cbd9493 100644 --- a/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt +++ b/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/lib/Makefile b/lib/Makefile index 0ddf917599f..52fdaaf7e0f 100644 --- a/lib/Makefile +++ b/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/tools/dsymutil/CMakeLists.txt b/tools/dsymutil/CMakeLists.txt index c397e3ed36c..5e1f37f6fdd 100644 --- a/tools/dsymutil/CMakeLists.txt +++ b/tools/dsymutil/CMakeLists.txt @@ -1,5 +1,5 @@ set(LLVM_LINK_COMPONENTS - DebugInfo + DebugInfoDWARF Object Support ) diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp index 7f6d69cc7de..62459b190b8 100644 --- a/tools/dsymutil/DwarfLinker.cpp +++ b/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 namespace llvm { diff --git a/tools/dsymutil/LLVMBuild.txt b/tools/dsymutil/LLVMBuild.txt index dd9151e2b9a..c99529140c2 100644 --- a/tools/dsymutil/LLVMBuild.txt +++ b/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/tools/dsymutil/Makefile b/tools/dsymutil/Makefile index fd437aa2ce3..e8dc5694634 100644 --- a/tools/dsymutil/Makefile +++ b/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/tools/lli/CMakeLists.txt b/tools/lli/CMakeLists.txt index 9217c382a98..0c2654be685 100644 --- a/tools/lli/CMakeLists.txt +++ b/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/tools/llvm-dwarfdump/CMakeLists.txt b/tools/llvm-dwarfdump/CMakeLists.txt index 288b3237010..086b1397461 100644 --- a/tools/llvm-dwarfdump/CMakeLists.txt +++ b/tools/llvm-dwarfdump/CMakeLists.txt @@ -1,5 +1,5 @@ set(LLVM_LINK_COMPONENTS - DebugInfo + DebugInfoDWARF Object Support ) diff --git a/tools/llvm-dwarfdump/LLVMBuild.txt b/tools/llvm-dwarfdump/LLVMBuild.txt index 28b7c4cda48..a9dca3e0cff 100644 --- a/tools/llvm-dwarfdump/LLVMBuild.txt +++ b/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/tools/llvm-dwarfdump/Makefile b/tools/llvm-dwarfdump/Makefile index 7ca1a8d877d..00b18c60bb2 100644 --- a/tools/llvm-dwarfdump/Makefile +++ b/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/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index cff8216403b..a99f57f5037 100644 --- a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/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/tools/llvm-go/llvm-go.go b/tools/llvm-go/llvm-go.go index cf520bd90e9..70d91d83893 100644 --- a/tools/llvm-go/llvm-go.go +++ b/tools/llvm-go/llvm-go.go @@ -46,7 +46,7 @@ var components = []string{ "bitwriter", "codegen", "core", - "debuginfo", + "debuginfodwarf", "executionengine", "instrumentation", "interpreter", diff --git a/tools/llvm-objdump/CMakeLists.txt b/tools/llvm-objdump/CMakeLists.txt index 61bf3b32757..d717653685c 100644 --- a/tools/llvm-objdump/CMakeLists.txt +++ b/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/tools/llvm-objdump/LLVMBuild.txt b/tools/llvm-objdump/LLVMBuild.txt index d16c501a6cc..42328737a7d 100644 --- a/tools/llvm-objdump/LLVMBuild.txt +++ b/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/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index e103842e54f..c996fc26ef2 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/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/tools/llvm-objdump/Makefile b/tools/llvm-objdump/Makefile index 4616b78adb2..7c165230dde 100644 --- a/tools/llvm-objdump/Makefile +++ b/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/tools/llvm-rtdyld/CMakeLists.txt b/tools/llvm-rtdyld/CMakeLists.txt index e294760801b..c1acbe5846b 100644 --- a/tools/llvm-rtdyld/CMakeLists.txt +++ b/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/tools/llvm-rtdyld/Makefile b/tools/llvm-rtdyld/Makefile index 9de753ef22a..3e868b98587 100644 --- a/tools/llvm-rtdyld/Makefile +++ b/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/tools/llvm-rtdyld/llvm-rtdyld.cpp b/tools/llvm-rtdyld/llvm-rtdyld.cpp index 5b6f301994d..58bf206e5fd 100644 --- a/tools/llvm-rtdyld/llvm-rtdyld.cpp +++ b/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/tools/llvm-symbolizer/CMakeLists.txt b/tools/llvm-symbolizer/CMakeLists.txt index 9e76248d83d..6968f1c6216 100644 --- a/tools/llvm-symbolizer/CMakeLists.txt +++ b/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/tools/llvm-symbolizer/LLVMSymbolize.h b/tools/llvm-symbolizer/LLVMSymbolize.h index ff848fceb24..c10922133f6 100644 --- a/tools/llvm-symbolizer/LLVMSymbolize.h +++ b/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/tools/llvm-symbolizer/Makefile b/tools/llvm-symbolizer/Makefile index 5ac83a58137..c5d2cf7659c 100644 --- a/tools/llvm-symbolizer/Makefile +++ b/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/unittests/DebugInfo/CMakeLists.txt b/unittests/DebugInfo/CMakeLists.txt index e844e95251a..ffc908608ab 100644 --- a/unittests/DebugInfo/CMakeLists.txt +++ b/unittests/DebugInfo/CMakeLists.txt @@ -1,5 +1,5 @@ set(LLVM_LINK_COMPONENTS - DebugInfo + DebugInfoDWARF ) set(DebugInfoSources diff --git a/unittests/DebugInfo/DWARFFormValueTest.cpp b/unittests/DebugInfo/DWARFFormValueTest.cpp index 38b932e3c9c..4521132de5e 100644 --- a/unittests/DebugInfo/DWARFFormValueTest.cpp +++ b/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/unittests/DebugInfo/Makefile b/unittests/DebugInfo/Makefile index 999ded90b0f..ad3cb22bbd1 100644 --- a/unittests/DebugInfo/Makefile +++ b/unittests/DebugInfo/Makefile @@ -9,7 +9,7 @@ LEVEL = ../.. TESTNAME = DebugInfo -LINK_COMPONENTS := debuginfo object support +LINK_COMPONENTS := DebugInfoDWARF object support include $(LEVEL)/Makefile.config -- 2.34.1