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

Cyndy Ishida via Phabricator via cfe-commits Fri, 02 Apr 2021 12:08:02 -0700

cishida created this revision.
cishida added reviewers: steven_wu, ributzka.
Herald added subscribers: hiraditya, mgorny.
Herald added a reviewer: int3.
Herald added a project: lld-macho.
Herald added a reviewer: lld-macho.
cishida requested review of this revision.
Herald added projects: clang, LLVM.
Herald added a subscriber: cfe-commits.


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


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D99811

Files:
  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/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/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/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/Object/TapiUniversal.cpp
  llvm/lib/TextAPI/Architecture.cpp
  llvm/lib/TextAPI/ArchitectureSet.cpp
  llvm/lib/TextAPI/CMakeLists.txt
  llvm/lib/TextAPI/InterfaceFile.cpp
  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
  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
  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

Index: llvm/unittests/TextAPI/TextStubV4Tests.cpp
===================================================================
--- llvm/unittests/TextAPI/TextStubV4Tests.cpp
+++ 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>
Index: llvm/unittests/TextAPI/TextStubV3Tests.cpp
===================================================================
--- llvm/unittests/TextAPI/TextStubV3Tests.cpp
+++ 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>
Index: llvm/unittests/TextAPI/TextStubV2Tests.cpp
===================================================================
--- llvm/unittests/TextAPI/TextStubV2Tests.cpp
+++ 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>
Index: llvm/unittests/TextAPI/TextStubV1Tests.cpp
===================================================================
--- llvm/unittests/TextAPI/TextStubV1Tests.cpp
+++ 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>
Index: llvm/unittests/TextAPI/TextStubHelpers.h
===================================================================
--- llvm/unittests/TextAPI/TextStubHelpers.h
+++ 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>
 
Index: llvm/tools/llvm-lipo/llvm-lipo.cpp
===================================================================
--- llvm/tools/llvm-lipo/llvm-lipo.cpp
+++ 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;
Index: llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp
===================================================================
--- llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp
+++ 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;
Index: llvm/tools/llvm-ifs/llvm-ifs.cpp
===================================================================
--- llvm/tools/llvm-ifs/llvm-ifs.cpp
+++ 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>
Index: llvm/lib/TextAPI/TextStubCommon.h
===================================================================
--- llvm/lib/TextAPI/TextStubCommon.h
+++ 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>;
 
Index: llvm/lib/TextAPI/TextStubCommon.cpp
===================================================================
--- llvm/lib/TextAPI/TextStubCommon.cpp
+++ llvm/lib/TextAPI/TextStubCommon.cpp
@@ -134,7 +134,7 @@
                                                  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
 }
 
Index: llvm/lib/TextAPI/TextStub.cpp
===================================================================
--- llvm/lib/TextAPI/TextStub.cpp
+++ 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>
 
Index: llvm/lib/TextAPI/MachO/TextAPIContext.h
===================================================================
--- /dev/null
+++ llvm/lib/TextAPI/MachO/TextAPIContext.h
@@ -1,32 +0,0 @@
-//===- TextAPIContext.h ---------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Defines the YAML Context for the TextAPI Reader/Writer.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TEXTAPI_MACHO_CONTEXT_H
-#define LLVM_TEXTAPI_MACHO_CONTEXT_H
-
-#include <string>
-
-namespace llvm {
-namespace MachO {
-
-enum FileType : unsigned;
-
-struct TextAPIContext {
-  std::string ErrorMessage;
-  std::string Path;
-  FileType FileKind;
-};
-
-} // end namespace MachO.
-} // end namespace llvm.
-
-#endif // LLVM_TEXTAPI_MACHO_CONTEXT_H
Index: llvm/lib/TextAPI/Target.cpp
===================================================================
--- llvm/lib/TextAPI/Target.cpp
+++ llvm/lib/TextAPI/Target.cpp
@@ -12,7 +12,7 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/TextAPI/MachO/Target.h"
+#include "llvm/TextAPI/Target.h"
 
 namespace llvm {
 namespace MachO {
Index: llvm/lib/TextAPI/Symbol.cpp
===================================================================
--- llvm/lib/TextAPI/Symbol.cpp
+++ llvm/lib/TextAPI/Symbol.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/Symbol.h"
+#include "llvm/TextAPI/Symbol.h"
 #include <string>
 
 namespace llvm {
Index: llvm/lib/TextAPI/Platform.cpp
===================================================================
--- llvm/lib/TextAPI/Platform.cpp
+++ 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.
@@ -12,7 +12,7 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Triple.h"
-#include "llvm/TextAPI/MachO/Platform.h"
+#include "llvm/TextAPI/Platform.h"
 
 namespace llvm {
 namespace MachO {
Index: llvm/lib/TextAPI/PackedVersion.cpp
===================================================================
--- llvm/lib/TextAPI/PackedVersion.cpp
+++ 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"
Index: llvm/lib/TextAPI/InterfaceFile.cpp
===================================================================
--- llvm/lib/TextAPI/InterfaceFile.cpp
+++ llvm/lib/TextAPI/InterfaceFile.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/TextAPI/MachO/InterfaceFile.h"
+#include "llvm/TextAPI/InterfaceFile.h"
 #include <iomanip>
 #include <sstream>
 
Index: llvm/lib/TextAPI/CMakeLists.txt
===================================================================
--- llvm/lib/TextAPI/CMakeLists.txt
+++ 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
Index: llvm/lib/TextAPI/ArchitectureSet.cpp
===================================================================
--- llvm/lib/TextAPI/ArchitectureSet.cpp
+++ 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 {
Index: llvm/lib/TextAPI/Architecture.cpp
===================================================================
--- llvm/lib/TextAPI/Architecture.cpp
+++ 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 @@
   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 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 @@
 #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 @@
 #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 @@
 #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;
Index: llvm/lib/Object/TapiUniversal.cpp
===================================================================
--- llvm/lib/Object/TapiUniversal.cpp
+++ 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;
Index: llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
===================================================================
--- /dev/null
+++ llvm/include/llvm/TextAPI/MachO/TextAPIWriter.h
@@ -1,31 +0,0 @@
-//===--- TextAPIWriter.h - Text API Writer ----------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TEXTAPI_MACHO_TEXTAPIWRITER_H
-#define LLVM_TEXTAPI_MACHO_TEXTAPIWRITER_H
-
-namespace llvm {
-
-class Error;
-class raw_ostream;
-
-namespace MachO {
-
-class InterfaceFile;
-
-class TextAPIWriter {
-public:
-  TextAPIWriter() = delete;
-
-  static Error writeToStream(raw_ostream &os, const InterfaceFile &);
-};
-
-} // end namespace MachO.
-} // end namespace llvm.
-
-#endif // LLVM_TEXTAPI_MACHO_TEXTAPIWRITER_H
Index: llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
===================================================================
--- /dev/null
+++ llvm/include/llvm/TextAPI/MachO/TextAPIReader.h
@@ -1,33 +0,0 @@
-//===--- TextAPIReader.h - Text API Reader ----------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TEXTAPI_MACHO_TEXTAPIREADER_H
-#define LLVM_TEXTAPI_MACHO_TEXTAPIREADER_H
-
-#include "llvm/Support/Error.h"
-
-namespace llvm {
-
-class MemoryBufferRef;
-
-namespace MachO {
-
-class InterfaceFile;
-
-class TextAPIReader {
-public:
-  static Expected<std::unique_ptr<InterfaceFile>>
-  get(MemoryBufferRef InputBuffer);
-
-  TextAPIReader() = delete;
-};
-
-} // end namespace MachO.
-} // end namespace llvm.
-
-#endif // LLVM_TEXTAPI_MACHO_TEXTAPIREADER_H
Index: llvm/include/llvm/TextAPI/Target.h
===================================================================
--- llvm/include/llvm/TextAPI/Target.h
+++ 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 {
Index: llvm/include/llvm/TextAPI/Symbol.h
===================================================================
--- llvm/include/llvm/TextAPI/Symbol.h
+++ 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 {
Index: llvm/include/llvm/TextAPI/Platform.h
===================================================================
--- llvm/include/llvm/TextAPI/Platform.h
+++ 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.
Index: llvm/include/llvm/TextAPI/PackedVersion.h
===================================================================
--- llvm/include/llvm/TextAPI/PackedVersion.h
+++ 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.
Index: llvm/include/llvm/TextAPI/InterfaceFile.h
===================================================================
--- llvm/include/llvm/TextAPI/InterfaceFile.h
+++ llvm/include/llvm/TextAPI/InterfaceFile.h
@@ -1,4 +1,4 @@
-//===- llvm/TextAPI/MachO/IntefaceFile.h - TAPI Interface File --*- C++ -*-===//
+//===- llvm/TextAPI/IntefaceFile.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 {
Index: llvm/include/llvm/TextAPI/ArchitectureSet.h
===================================================================
--- llvm/include/llvm/TextAPI/ArchitectureSet.h
+++ 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>
Index: llvm/include/llvm/TextAPI/Architecture.h
===================================================================
--- llvm/include/llvm/TextAPI/Architecture.h
+++ 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 @@
 /// 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.
 };
Index: llvm/include/llvm/TextAPI/Architecture.def
===================================================================
--- llvm/include/llvm/TextAPI/Architecture.def
+++ 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.
Index: llvm/include/llvm/Object/TapiUniversal.h
===================================================================
--- llvm/include/llvm/Object/TapiUniversal.h
+++ 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 {
Index: llvm/include/llvm/Object/TapiFile.h
===================================================================
--- llvm/include/llvm/Object/TapiFile.h
+++ 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 {
Index: lld/lib/ReaderWriter/MachO/File.h
===================================================================
--- lld/lib/ReaderWriter/MachO/File.h
+++ 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 {
Index: lld/MachO/InputFiles.h
===================================================================
--- lld/MachO/InputFiles.h
+++ 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>
Index: lld/MachO/InputFiles.cpp
===================================================================
--- lld/MachO/InputFiles.cpp
+++ 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;
Index: lld/MachO/DriverUtils.cpp
===================================================================
--- lld/MachO/DriverUtils.cpp
+++ lld/MachO/DriverUtils.cpp
@@ -25,8 +25,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;
Index: lld/MachO/Driver.cpp
===================================================================
--- lld/MachO/Driver.cpp
+++ 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>
 
Index: lld/MachO/Config.h
===================================================================
--- lld/MachO/Config.h
+++ 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>
 
Index: clang/docs/ClangFormattedStatus.rst
===================================================================
--- clang/docs/ClangFormattedStatus.rst
+++ clang/docs/ClangFormattedStatus.rst
@@ -3854,7 +3854,7 @@
      - `2`
      - `1`
      - :part:`66%`
-   * - llvm/include/llvm/TextAPI/MachO
+   * - llvm/include/llvm/TextAPI
      - `9`
      - `8`
      - `1`
@@ -4749,7 +4749,7 @@
      - `3`
      - `0`
      - :good:`100%`
-   * - llvm/lib/TextAPI/MachO
+   * - llvm/lib/TextAPI
      - `11`
      - `8`
      - `3`

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

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

Reply via email to