[clang] 0116d04 - [TextAPI] move source code files out of subdirectory, NFC

Cyndy Ishida via cfe-commits cfe-commits at lists.llvm.org
Mon Apr 5 10:27:26 PDT 2021 

Author: Cyndy Ishida
Date: 2021-04-05T10:24:42-07:00
New Revision: 0116d04d04f20e9ae62ba847075840c3cb298080

URL: https://github.com/llvm/llvm-project/commit/0116d04d04f20e9ae62ba847075840c3cb298080
DIFF: https://github.com/llvm/llvm-project/commit/0116d04d04f20e9ae62ba847075840c3cb298080.diff

LOG: [TextAPI] move source code files out of subdirectory, NFC

TextAPI/ELF has moved out into InterfaceStubs, so theres no longer a
need to seperate out TextAPI between formats.

Reviewed By: ributzka, int3, #lld-macho

Differential Revision: https://reviews.llvm.org/D99811

Added: 
    llvm/include/llvm/TextAPI/Architecture.def
    llvm/include/llvm/TextAPI/Architecture.h
    llvm/include/llvm/TextAPI/ArchitectureSet.h
    llvm/include/llvm/TextAPI/InterfaceFile.h
    llvm/include/llvm/TextAPI/PackedVersion.h
    llvm/include/llvm/TextAPI/Platform.h
    llvm/include/llvm/TextAPI/Symbol.h
    llvm/include/llvm/TextAPI/Target.h
    llvm/include/llvm/TextAPI/TextAPIReader.h
    llvm/include/llvm/TextAPI/TextAPIWriter.h
    llvm/lib/TextAPI/Architecture.cpp
    llvm/lib/TextAPI/ArchitectureSet.cpp
    llvm/lib/TextAPI/InterfaceFile.cpp
    llvm/lib/TextAPI/PackedVersion.cpp
    llvm/lib/TextAPI/Platform.cpp
    llvm/lib/TextAPI/Symbol.cpp
    llvm/lib/TextAPI/Target.cpp
    llvm/lib/TextAPI/TextAPIContext.h
    llvm/lib/TextAPI/TextStub.cpp
    llvm/lib/TextAPI/TextStubCommon.cpp
    llvm/lib/TextAPI/TextStubCommon.h

Modified: 
    clang/docs/ClangFormattedStatus.rst
    lld/MachO/Config.h
    lld/MachO/Driver.cpp
    lld/MachO/DriverUtils.cpp
    lld/MachO/InputFiles.cpp
    lld/MachO/InputFiles.h
    lld/lib/ReaderWriter/MachO/File.h
    llvm/include/llvm/Object/TapiFile.h
    llvm/include/llvm/Object/TapiUniversal.h
    llvm/lib/Object/TapiUniversal.cpp
    llvm/lib/TextAPI/CMakeLists.txt
    llvm/tools/llvm-ifs/llvm-ifs.cpp
    llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp
    llvm/tools/llvm-lipo/llvm-lipo.cpp
    llvm/unittests/TextAPI/TextStubHelpers.h
    llvm/unittests/TextAPI/TextStubV1Tests.cpp
    llvm/unittests/TextAPI/TextStubV2Tests.cpp
    llvm/unittests/TextAPI/TextStubV3Tests.cpp
    llvm/unittests/TextAPI/TextStubV4Tests.cpp

Removed: 
    llvm/include/llvm/TextAPI/MachO/Architecture.def
    llvm/include/llvm/TextAPI/MachO/Architecture.h
    llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
    llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
    llvm/include/llvm/TextAPI/MachO/PackedVersion.h
    llvm/include/llvm/TextAPI/MachO/Platform.h
    llvm/include/llvm/TextAPI/MachO/Symbol.h
    llvm/include/llvm/TextAPI/MachO/Target.h
    llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
    llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
    llvm/lib/TextAPI/MachO/Architecture.cpp
    llvm/lib/TextAPI/MachO/ArchitectureSet.cpp
    llvm/lib/TextAPI/MachO/InterfaceFile.cpp
    llvm/lib/TextAPI/MachO/PackedVersion.cpp
    llvm/lib/TextAPI/MachO/Platform.cpp
    llvm/lib/TextAPI/MachO/Symbol.cpp
    llvm/lib/TextAPI/MachO/Target.cpp
    llvm/lib/TextAPI/MachO/TextAPIContext.h
    llvm/lib/TextAPI/MachO/TextStub.cpp
    llvm/lib/TextAPI/MachO/TextStubCommon.cpp
    llvm/lib/TextAPI/MachO/TextStubCommon.h


################################################################################
diff  --git a/clang/docs/ClangFormattedStatus.rst b/clang/docs/ClangFormattedStatus.rst
index 108351c169313..a936a8fd727d8 100644
--- a/clang/docs/ClangFormattedStatus.rst
+++ b/clang/docs/ClangFormattedStatus.rst
@@ -3854,7 +3854,7 @@ tree in terms of conformance to :doc:`ClangFormat` as of: December 04, 2020 17:5
      - `2`
      - `1`
      - :part:`66%`
-   * - llvm/include/llvm/TextAPI/MachO
+   * - llvm/include/llvm/TextAPI
      - `9`
      - `8`
      - `1`
@@ -4749,7 +4749,7 @@ tree in terms of conformance to :doc:`ClangFormat` as of: December 04, 2020 17:5
      - `3`
      - `0`
      - :good:`100%`
-   * - llvm/lib/TextAPI/MachO
+   * - llvm/lib/TextAPI
      - `11`
      - `8`
      - `3`

diff  --git a/lld/MachO/Config.h b/lld/MachO/Config.h
index c629c842a1944..5c9faa8c7328a 100644
--- a/lld/MachO/Config.h
+++ b/lld/MachO/Config.h
@@ -16,9 +16,9 @@
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/Support/GlobPattern.h"
 #include "llvm/Support/VersionTuple.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/Platform.h"
-#include "llvm/TextAPI/MachO/Target.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/Platform.h"
+#include "llvm/TextAPI/Target.h"
 
 #include <vector>
 

diff  --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp
index d0666d6ea3df9..2a65c44f5433f 100644
--- a/lld/MachO/Driver.cpp
+++ b/lld/MachO/Driver.cpp
@@ -43,7 +43,7 @@
 #include "llvm/Support/TarWriter.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/TimeProfiler.h"
-#include "llvm/TextAPI/MachO/PackedVersion.h"
+#include "llvm/TextAPI/PackedVersion.h"
 
 #include <algorithm>
 

diff  --git a/lld/MachO/DriverUtils.cpp b/lld/MachO/DriverUtils.cpp
index fe1585fab42b9..064a509f47c8f 100644
--- a/lld/MachO/DriverUtils.cpp
+++ b/lld/MachO/DriverUtils.cpp
@@ -26,8 +26,8 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
 
 using namespace llvm;
 using namespace llvm::MachO;

diff  --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
index a663a50c23865..7bd9883facc0f 100644
--- a/lld/MachO/InputFiles.cpp
+++ b/lld/MachO/InputFiles.cpp
@@ -66,8 +66,8 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/TarWriter.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/InterfaceFile.h"
 
 using namespace llvm;
 using namespace llvm::MachO;

diff  --git a/lld/MachO/InputFiles.h b/lld/MachO/InputFiles.h
index d9b3479db6324..214f026e168c6 100644
--- a/lld/MachO/InputFiles.h
+++ b/lld/MachO/InputFiles.h
@@ -19,7 +19,7 @@
 #include "llvm/DebugInfo/DWARF/DWARFUnit.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIReader.h"
 
 #include <map>
 #include <vector>

diff  --git a/lld/lib/ReaderWriter/MachO/File.h b/lld/lib/ReaderWriter/MachO/File.h
index 8d59656beab58..77832969c6b34 100644
--- a/lld/lib/ReaderWriter/MachO/File.h
+++ b/lld/lib/ReaderWriter/MachO/File.h
@@ -17,8 +17,8 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/Format.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
 #include <unordered_map>
 
 namespace lld {

diff  --git a/llvm/include/llvm/Object/TapiFile.h b/llvm/include/llvm/Object/TapiFile.h
index 8de164ac60e77..ffa27fdf96544 100644
--- a/llvm/include/llvm/Object/TapiFile.h
+++ b/llvm/include/llvm/Object/TapiFile.h
@@ -18,7 +18,7 @@
 #include "llvm/Object/SymbolicFile.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
+#include "llvm/TextAPI/InterfaceFile.h"
 
 namespace llvm {
 namespace object {

diff  --git a/llvm/include/llvm/Object/TapiUniversal.h b/llvm/include/llvm/Object/TapiUniversal.h
index bddfd4b781cf4..8f716ace0206a 100644
--- a/llvm/include/llvm/Object/TapiUniversal.h
+++ b/llvm/include/llvm/Object/TapiUniversal.h
@@ -17,8 +17,8 @@
 #include "llvm/Object/TapiFile.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/InterfaceFile.h"
 
 namespace llvm {
 namespace object {

diff  --git a/llvm/include/llvm/TextAPI/MachO/Architecture.def b/llvm/include/llvm/TextAPI/Architecture.def
similarity index 96%
rename from llvm/include/llvm/TextAPI/MachO/Architecture.def
rename to llvm/include/llvm/TextAPI/Architecture.def
index 85ff69002682a..58ef31b25fe0b 100644
--- a/llvm/include/llvm/TextAPI/MachO/Architecture.def
+++ b/llvm/include/llvm/TextAPI/Architecture.def
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/Architecture.def - Architecture -----------------===//
+//===- llvm/TextAPI/Architecture.def - Architecture -----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

diff  --git a/llvm/include/llvm/TextAPI/MachO/Architecture.h b/llvm/include/llvm/TextAPI/Architecture.h
similarity index 93%
rename from llvm/include/llvm/TextAPI/MachO/Architecture.h
rename to llvm/include/llvm/TextAPI/Architecture.h
index 7a9f951d03166..3cd8a3a19e96f 100644
--- a/llvm/include/llvm/TextAPI/MachO/Architecture.h
+++ b/llvm/include/llvm/TextAPI/Architecture.h
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/Architecture.h - Architecture ---------*- C++ -*-===//
+//===- llvm/TextAPI/Architecture.h - Architecture ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -26,7 +26,7 @@ namespace MachO {
 /// Defines the architecture slices that are supported by Text-based Stub files.
 enum Architecture : uint8_t {
 #define ARCHINFO(Arch, Type, SubType, NumBits) AK_##Arch,
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
   AK_unknown, // this has to go last.
 };

diff  --git a/llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h b/llvm/include/llvm/TextAPI/ArchitectureSet.h
similarity index 97%
rename from llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
rename to llvm/include/llvm/TextAPI/ArchitectureSet.h
index 74e091ade9c28..0901278141c9d 100644
--- a/llvm/include/llvm/TextAPI/MachO/ArchitectureSet.h
+++ b/llvm/include/llvm/TextAPI/ArchitectureSet.h
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/ArchitectureSet.h - ArchitectureSet ---*- C++ -*-===//
+//===- llvm/TextAPI/ArchitectureSet.h - ArchitectureSet ---------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,7 +13,7 @@
 #ifndef LLVM_TEXTAPI_MACHO_ARCHITECTURESET_H
 #define LLVM_TEXTAPI_MACHO_ARCHITECTURESET_H
 
-#include "llvm/TextAPI/MachO/Architecture.h"
+#include "llvm/TextAPI/Architecture.h"
 #include <cstddef>
 #include <iterator>
 #include <limits>

diff  --git a/llvm/include/llvm/TextAPI/MachO/InterfaceFile.h b/llvm/include/llvm/TextAPI/InterfaceFile.h
similarity index 97%
rename from llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
rename to llvm/include/llvm/TextAPI/InterfaceFile.h
index 9dc1204691410..d17c0c1c5b47c 100644
--- a/llvm/include/llvm/TextAPI/MachO/InterfaceFile.h
+++ b/llvm/include/llvm/TextAPI/InterfaceFile.h
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/IntefaceFile.h - TAPI Interface File --*- C++ -*-===//
+//===- llvm/TextAPI/InterfaceFile.h - TAPI Interface File -------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -23,12 +23,12 @@
 #include "llvm/BinaryFormat/Magic.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Error.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
-#include "llvm/TextAPI/MachO/PackedVersion.h"
-#include "llvm/TextAPI/MachO/Platform.h"
-#include "llvm/TextAPI/MachO/Symbol.h"
-#include "llvm/TextAPI/MachO/Target.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
+#include "llvm/TextAPI/PackedVersion.h"
+#include "llvm/TextAPI/Platform.h"
+#include "llvm/TextAPI/Symbol.h"
+#include "llvm/TextAPI/Target.h"
 
 namespace llvm {
 namespace MachO {

diff  --git a/llvm/include/llvm/TextAPI/MachO/PackedVersion.h b/llvm/include/llvm/TextAPI/PackedVersion.h
similarity index 96%
rename from llvm/include/llvm/TextAPI/MachO/PackedVersion.h
rename to llvm/include/llvm/TextAPI/PackedVersion.h
index b98a3b1c8b5fa..e3d2bd5ae2e50 100644
--- a/llvm/include/llvm/TextAPI/MachO/PackedVersion.h
+++ b/llvm/include/llvm/TextAPI/PackedVersion.h
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/PackedVersion.h - PackedVersion -------*- C++ -*-===//
+//===- llvm/TextAPI/PackedVersion.h - PackedVersion -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

diff  --git a/llvm/include/llvm/TextAPI/MachO/Platform.h b/llvm/include/llvm/TextAPI/Platform.h
similarity index 95%
rename from llvm/include/llvm/TextAPI/MachO/Platform.h
rename to llvm/include/llvm/TextAPI/Platform.h
index fc59b8678af78..7a81b496cf842 100644
--- a/llvm/include/llvm/TextAPI/MachO/Platform.h
+++ b/llvm/include/llvm/TextAPI/Platform.h
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/Platform.h - Platform -----------------*- C++ -*-===//
+//===- llvm/TextAPI/Platform.h - Platform -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

diff  --git a/llvm/include/llvm/TextAPI/MachO/Symbol.h b/llvm/include/llvm/TextAPI/Symbol.h
similarity index 97%
rename from llvm/include/llvm/TextAPI/MachO/Symbol.h
rename to llvm/include/llvm/TextAPI/Symbol.h
index 4f7fb2d483a5e..878befcd90b7e 100644
--- a/llvm/include/llvm/TextAPI/MachO/Symbol.h
+++ b/llvm/include/llvm/TextAPI/Symbol.h
@@ -13,8 +13,8 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
-#include "llvm/TextAPI/MachO/Target.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
+#include "llvm/TextAPI/Target.h"
 
 namespace llvm {
 namespace MachO {

diff  --git a/llvm/include/llvm/TextAPI/MachO/Target.h b/llvm/include/llvm/TextAPI/Target.h
similarity index 93%
rename from llvm/include/llvm/TextAPI/MachO/Target.h
rename to llvm/include/llvm/TextAPI/Target.h
index 5fe44cb7d366f..c4c2a6d019cb9 100644
--- a/llvm/include/llvm/TextAPI/MachO/Target.h
+++ b/llvm/include/llvm/TextAPI/Target.h
@@ -11,9 +11,9 @@
 
 #include "llvm/ADT/Triple.h"
 #include "llvm/Support/Error.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
-#include "llvm/TextAPI/MachO/Platform.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
+#include "llvm/TextAPI/Platform.h"
 
 namespace llvm {
 namespace MachO {

diff  --git a/llvm/include/llvm/TextAPI/MachO/TextAPIReader.h b/llvm/include/llvm/TextAPI/TextAPIReader.h
similarity index 100%
rename from llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
rename to llvm/include/llvm/TextAPI/TextAPIReader.h

diff  --git a/llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h b/llvm/include/llvm/TextAPI/TextAPIWriter.h
similarity index 100%
rename from llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
rename to llvm/include/llvm/TextAPI/TextAPIWriter.h

diff  --git a/llvm/lib/Object/TapiUniversal.cpp b/llvm/lib/Object/TapiUniversal.cpp
index 48cb949cb6f4d..d73d93f6bd538 100644
--- a/llvm/lib/Object/TapiUniversal.cpp
+++ b/llvm/lib/Object/TapiUniversal.cpp
@@ -14,7 +14,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Object/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIReader.h"
 
 using namespace llvm;
 using namespace MachO;

diff  --git a/llvm/lib/TextAPI/MachO/Architecture.cpp b/llvm/lib/TextAPI/Architecture.cpp
similarity index 89%
rename from llvm/lib/TextAPI/MachO/Architecture.cpp
rename to llvm/lib/TextAPI/Architecture.cpp
index 0c59880303369..e1901d5c0ce52 100644
--- a/llvm/lib/TextAPI/MachO/Architecture.cpp
+++ b/llvm/lib/TextAPI/Architecture.cpp
@@ -10,12 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/Architecture.h"
+#include "llvm/TextAPI/Architecture.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
 
 namespace llvm {
 namespace MachO {
@@ -25,7 +25,7 @@ Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType) {
   if (CPUType == (Type) &&                                                     \
       (CPUSubType & ~MachO::CPU_SUBTYPE_MASK) == (Subtype))                    \
     return AK_##Arch;
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
 
   return AK_unknown;
@@ -34,7 +34,7 @@ Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType) {
 Architecture getArchitectureFromName(StringRef Name) {
   return StringSwitch<Architecture>(Name)
 #define ARCHINFO(Arch, Type, Subtype, NumBits) .Case(#Arch, AK_##Arch)
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
       .Default(AK_unknown);
 }
@@ -44,7 +44,7 @@ StringRef getArchitectureName(Architecture Arch) {
 #define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
   case AK_##Arch:                                                              \
     return #Arch;
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
   case AK_unknown:
     return "unknown";
@@ -60,7 +60,7 @@ std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) {
 #define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
   case AK_##Arch:                                                              \
     return std::make_pair(Type, Subtype);
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
   case AK_unknown:
     return std::make_pair(0, 0);
@@ -80,7 +80,7 @@ bool is64Bit(Architecture Arch) {
 #define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
   case AK_##Arch:                                                              \
     return NumBits == 64;
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
   case AK_unknown:
     return false;

diff  --git a/llvm/lib/TextAPI/MachO/ArchitectureSet.cpp b/llvm/lib/TextAPI/ArchitectureSet.cpp
similarity index 97%
rename from llvm/lib/TextAPI/MachO/ArchitectureSet.cpp
rename to llvm/lib/TextAPI/ArchitectureSet.cpp
index f665706fad811..0fc2ede37acfe 100644
--- a/llvm/lib/TextAPI/MachO/ArchitectureSet.cpp
+++ b/llvm/lib/TextAPI/ArchitectureSet.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm {

diff  --git a/llvm/lib/TextAPI/CMakeLists.txt b/llvm/lib/TextAPI/CMakeLists.txt
index e0bf842711065..6dc3cccafc8d7 100644
--- a/llvm/lib/TextAPI/CMakeLists.txt
+++ b/llvm/lib/TextAPI/CMakeLists.txt
@@ -1,18 +1,16 @@
 add_llvm_component_library(LLVMTextAPI
-  MachO/Architecture.cpp
-  MachO/ArchitectureSet.cpp
-  MachO/InterfaceFile.cpp
-  MachO/PackedVersion.cpp
-  MachO/Platform.cpp
-  MachO/Symbol.cpp
-  MachO/Target.cpp
-  MachO/TextStub.cpp
-  MachO/TextStubCommon.cpp
+  Architecture.cpp
+  ArchitectureSet.cpp
+  InterfaceFile.cpp
+  PackedVersion.cpp
+  Platform.cpp
+  Symbol.cpp
+  Target.cpp
+  TextStub.cpp
+  TextStubCommon.cpp
 
   ADDITIONAL_HEADER_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI"
-  "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI/Elf"
-  "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI/MachO"
 
   LINK_COMPONENTS
   Support

diff  --git a/llvm/lib/TextAPI/MachO/InterfaceFile.cpp b/llvm/lib/TextAPI/InterfaceFile.cpp
similarity index 99%
rename from llvm/lib/TextAPI/MachO/InterfaceFile.cpp
rename to llvm/lib/TextAPI/InterfaceFile.cpp
index ad6f1d3db0573..1156a39228e7a 100644
--- a/llvm/lib/TextAPI/MachO/InterfaceFile.cpp
+++ b/llvm/lib/TextAPI/InterfaceFile.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
+#include "llvm/TextAPI/InterfaceFile.h"
 #include <iomanip>
 #include <sstream>
 

diff  --git a/llvm/lib/TextAPI/MachO/PackedVersion.cpp b/llvm/lib/TextAPI/PackedVersion.cpp
similarity index 98%
rename from llvm/lib/TextAPI/MachO/PackedVersion.cpp
rename to llvm/lib/TextAPI/PackedVersion.cpp
index 8405aba90ed60..f8171e02b6d3e 100644
--- a/llvm/lib/TextAPI/MachO/PackedVersion.cpp
+++ b/llvm/lib/TextAPI/PackedVersion.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/PackedVersion.h"
+#include "llvm/TextAPI/PackedVersion.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"

diff  --git a/llvm/lib/TextAPI/MachO/Platform.cpp b/llvm/lib/TextAPI/Platform.cpp
similarity index 96%
rename from llvm/lib/TextAPI/MachO/Platform.cpp
rename to llvm/lib/TextAPI/Platform.cpp
index f454c1cb6b160..d68a0dd483eff 100644
--- a/llvm/lib/TextAPI/MachO/Platform.cpp
+++ b/llvm/lib/TextAPI/Platform.cpp
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/Platform.cpp - Platform ---------------*- C++ -*-===//
+//===- llvm/TextAPI/Platform.cpp - Platform ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/TextAPI/Platform.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Triple.h"
-#include "llvm/TextAPI/MachO/Platform.h"
 
 namespace llvm {
 namespace MachO {

diff  --git a/llvm/lib/TextAPI/MachO/Symbol.cpp b/llvm/lib/TextAPI/Symbol.cpp
similarity index 97%
rename from llvm/lib/TextAPI/MachO/Symbol.cpp
rename to llvm/lib/TextAPI/Symbol.cpp
index 9f2d8172beed4..041f553c66f33 100644
--- a/llvm/lib/TextAPI/MachO/Symbol.cpp
+++ b/llvm/lib/TextAPI/Symbol.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/Symbol.h"
+#include "llvm/TextAPI/Symbol.h"
 #include <string>
 
 namespace llvm {

diff  --git a/llvm/lib/TextAPI/MachO/Target.cpp b/llvm/lib/TextAPI/Target.cpp
similarity index 96%
rename from llvm/lib/TextAPI/MachO/Target.cpp
rename to llvm/lib/TextAPI/Target.cpp
index 6f8d9bb4e19aa..4c33a5883247e 100644
--- a/llvm/lib/TextAPI/MachO/Target.cpp
+++ b/llvm/lib/TextAPI/Target.cpp
@@ -1,4 +1,4 @@
-//===- tapi/Core/Target.cpp - Target ----------------------------*- C++ -*-===//
+//===- Target.cpp -----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/TextAPI/Target.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TextAPI/MachO/Target.h"
 
 namespace llvm {
 namespace MachO {

diff  --git a/llvm/lib/TextAPI/MachO/TextAPIContext.h b/llvm/lib/TextAPI/TextAPIContext.h
similarity index 100%
rename from llvm/lib/TextAPI/MachO/TextAPIContext.h
rename to llvm/lib/TextAPI/TextAPIContext.h

diff  --git a/llvm/lib/TextAPI/MachO/TextStub.cpp b/llvm/lib/TextAPI/TextStub.cpp
similarity index 99%
rename from llvm/lib/TextAPI/MachO/TextStub.cpp
rename to llvm/lib/TextAPI/TextStub.cpp
index 68c0d6b25006d..5d85342adb267 100644
--- a/llvm/lib/TextAPI/MachO/TextStub.cpp
+++ b/llvm/lib/TextAPI/TextStub.cpp
@@ -19,12 +19,12 @@
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/PackedVersion.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
-#include "llvm/TextAPI/MachO/TextAPIWriter.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/PackedVersion.h"
+#include "llvm/TextAPI/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIWriter.h"
 #include <algorithm>
 #include <set>
 

diff  --git a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp b/llvm/lib/TextAPI/TextStubCommon.cpp
similarity index 99%
rename from llvm/lib/TextAPI/MachO/TextStubCommon.cpp
rename to llvm/lib/TextAPI/TextStubCommon.cpp
index 0d3614b0a24c9..c2713b9b52037 100644
--- a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
+++ b/llvm/lib/TextAPI/TextStubCommon.cpp
@@ -134,7 +134,7 @@ void ScalarBitSetTraits<ArchitectureSet>::bitset(IO &IO,
                                                  ArchitectureSet &Archs) {
 #define ARCHINFO(arch, type, subtype, numbits)                                 \
   IO.bitSetCase(Archs, #arch, 1U << static_cast<int>(AK_##arch));
-#include "llvm/TextAPI/MachO/Architecture.def"
+#include "llvm/TextAPI/Architecture.def"
 #undef ARCHINFO
 }
 

diff  --git a/llvm/lib/TextAPI/MachO/TextStubCommon.h b/llvm/lib/TextAPI/TextStubCommon.h
similarity index 93%
rename from llvm/lib/TextAPI/MachO/TextStubCommon.h
rename to llvm/lib/TextAPI/TextStubCommon.h
index f2cda50e297d0..89ae5d56297c0 100644
--- a/llvm/lib/TextAPI/MachO/TextStubCommon.h
+++ b/llvm/lib/TextAPI/TextStubCommon.h
@@ -15,10 +15,10 @@
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/YAMLTraits.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/PackedVersion.h"
+#include "llvm/TextAPI/Architecture.h"
+#include "llvm/TextAPI/ArchitectureSet.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/PackedVersion.h"
 
 using UUID = std::pair<llvm::MachO::Target, std::string>;
 

diff  --git a/llvm/tools/llvm-ifs/llvm-ifs.cpp b/llvm/tools/llvm-ifs/llvm-ifs.cpp
index 5eda7082a8971..129dc89d35891 100644
--- a/llvm/tools/llvm-ifs/llvm-ifs.cpp
+++ b/llvm/tools/llvm-ifs/llvm-ifs.cpp
@@ -22,9 +22,9 @@
 #include "llvm/Support/WithColor.h"
 #include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
-#include "llvm/TextAPI/MachO/TextAPIWriter.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIWriter.h"
 #include <set>
 #include <string>
 #include <vector>

diff  --git a/llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp b/llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp
index f16b4a17105c6..25f4296d4e2e7 100644
--- a/llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp
+++ b/llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp
@@ -22,7 +22,7 @@
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/LineIterator.h"
 #include "llvm/Support/WithColor.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
+#include "llvm/TextAPI/Architecture.h"
 #include <map>
 
 using namespace llvm;

diff  --git a/llvm/tools/llvm-lipo/llvm-lipo.cpp b/llvm/tools/llvm-lipo/llvm-lipo.cpp
index 7fbe489ecc6fd..7452ecafcfc02 100644
--- a/llvm/tools/llvm-lipo/llvm-lipo.cpp
+++ b/llvm/tools/llvm-lipo/llvm-lipo.cpp
@@ -28,7 +28,7 @@
 #include "llvm/Support/FileOutputBuffer.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/WithColor.h"
-#include "llvm/TextAPI/MachO/Architecture.h"
+#include "llvm/TextAPI/Architecture.h"
 
 using namespace llvm;
 using namespace llvm::object;

diff  --git a/llvm/unittests/TextAPI/TextStubHelpers.h b/llvm/unittests/TextAPI/TextStubHelpers.h
index 183dbf0527512..67bfa1aba2b70 100644
--- a/llvm/unittests/TextAPI/TextStubHelpers.h
+++ b/llvm/unittests/TextAPI/TextStubHelpers.h
@@ -7,7 +7,7 @@
 //===-----------------------------------------------------------------------===/
 
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
+#include "llvm/TextAPI/InterfaceFile.h"
 #include <algorithm>
 #include <string>
 

diff  --git a/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/llvm/unittests/TextAPI/TextStubV1Tests.cpp
index 64b9769d427fc..7931070b531ab 100644
--- a/llvm/unittests/TextAPI/TextStubV1Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV1Tests.cpp
@@ -7,9 +7,9 @@
 //===-----------------------------------------------------------------------===/
 
 #include "TextStubHelpers.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
-#include "llvm/TextAPI/MachO/TextAPIWriter.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIWriter.h"
 #include "gtest/gtest.h"
 #include <string>
 #include <vector>

diff  --git a/llvm/unittests/TextAPI/TextStubV2Tests.cpp b/llvm/unittests/TextAPI/TextStubV2Tests.cpp
index c9e54ac6b3ad8..873fc1ff553a0 100644
--- a/llvm/unittests/TextAPI/TextStubV2Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV2Tests.cpp
@@ -6,9 +6,9 @@
 //
 //===-----------------------------------------------------------------------===/
 #include "TextStubHelpers.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
-#include "llvm/TextAPI/MachO/TextAPIWriter.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIWriter.h"
 #include "gtest/gtest.h"
 #include <string>
 #include <vector>

diff  --git a/llvm/unittests/TextAPI/TextStubV3Tests.cpp b/llvm/unittests/TextAPI/TextStubV3Tests.cpp
index 8841b204a27f4..bad3b45e0c3c9 100644
--- a/llvm/unittests/TextAPI/TextStubV3Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV3Tests.cpp
@@ -6,9 +6,9 @@
 //
 //===-----------------------------------------------------------------------===/
 #include "TextStubHelpers.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
-#include "llvm/TextAPI/MachO/TextAPIWriter.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIWriter.h"
 #include "gtest/gtest.h"
 #include <string>
 #include <vector>

diff  --git a/llvm/unittests/TextAPI/TextStubV4Tests.cpp b/llvm/unittests/TextAPI/TextStubV4Tests.cpp
index 87dae846ee267..620363cae8193 100644
--- a/llvm/unittests/TextAPI/TextStubV4Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV4Tests.cpp
@@ -7,9 +7,9 @@
 //===-----------------------------------------------------------------------===/
 
 #include "TextStubHelpers.h"
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
-#include "llvm/TextAPI/MachO/TextAPIReader.h"
-#include "llvm/TextAPI/MachO/TextAPIWriter.h"
+#include "llvm/TextAPI/InterfaceFile.h"
+#include "llvm/TextAPI/TextAPIReader.h"
+#include "llvm/TextAPI/TextAPIWriter.h"
 #include "gtest/gtest.h"
 #include <string>
 #include <vector>

More information about the cfe-commits mailing list