From 0116d04d04f20e9ae62ba847075840c3cb298080 Mon Sep 17 00:00:00 2001 From: Cyndy Ishida Date: Mon, 5 Apr 2021 09:59:50 -0700 Subject: [PATCH] [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 --- clang/docs/ClangFormattedStatus.rst | 4 ++-- lld/MachO/Config.h | 6 +++--- lld/MachO/Driver.cpp | 2 +- lld/MachO/DriverUtils.cpp | 4 ++-- lld/MachO/InputFiles.cpp | 4 ++-- lld/MachO/InputFiles.h | 2 +- lld/lib/ReaderWriter/MachO/File.h | 4 ++-- llvm/include/llvm/Object/TapiFile.h | 2 +- llvm/include/llvm/Object/TapiUniversal.h | 4 ++-- .../llvm/TextAPI/{MachO => }/Architecture.def | 2 +- llvm/include/llvm/TextAPI/{MachO => }/Architecture.h | 4 ++-- .../llvm/TextAPI/{MachO => }/ArchitectureSet.h | 4 ++-- .../include/llvm/TextAPI/{MachO => }/InterfaceFile.h | 14 +++++++------- .../include/llvm/TextAPI/{MachO => }/PackedVersion.h | 2 +- llvm/include/llvm/TextAPI/{MachO => }/Platform.h | 2 +- llvm/include/llvm/TextAPI/{MachO => }/Symbol.h | 4 ++-- llvm/include/llvm/TextAPI/{MachO => }/Target.h | 6 +++--- .../include/llvm/TextAPI/{MachO => }/TextAPIReader.h | 0 .../include/llvm/TextAPI/{MachO => }/TextAPIWriter.h | 0 llvm/lib/Object/TapiUniversal.cpp | 2 +- llvm/lib/TextAPI/{MachO => }/Architecture.cpp | 14 +++++++------- llvm/lib/TextAPI/{MachO => }/ArchitectureSet.cpp | 2 +- llvm/lib/TextAPI/CMakeLists.txt | 20 +++++++++----------- llvm/lib/TextAPI/{MachO => }/InterfaceFile.cpp | 2 +- llvm/lib/TextAPI/{MachO => }/PackedVersion.cpp | 2 +- llvm/lib/TextAPI/{MachO => }/Platform.cpp | 4 ++-- llvm/lib/TextAPI/{MachO => }/Symbol.cpp | 2 +- llvm/lib/TextAPI/{MachO => }/Target.cpp | 4 ++-- llvm/lib/TextAPI/{MachO => }/TextAPIContext.h | 0 llvm/lib/TextAPI/{MachO => }/TextStub.cpp | 12 ++++++------ llvm/lib/TextAPI/{MachO => }/TextStubCommon.cpp | 2 +- llvm/lib/TextAPI/{MachO => }/TextStubCommon.h | 8 ++++---- llvm/tools/llvm-ifs/llvm-ifs.cpp | 6 +++--- .../llvm-libtool-darwin/llvm-libtool-darwin.cpp | 2 +- llvm/tools/llvm-lipo/llvm-lipo.cpp | 2 +- llvm/unittests/TextAPI/TextStubHelpers.h | 2 +- llvm/unittests/TextAPI/TextStubV1Tests.cpp | 6 +++--- llvm/unittests/TextAPI/TextStubV2Tests.cpp | 6 +++--- llvm/unittests/TextAPI/TextStubV3Tests.cpp | 6 +++--- llvm/unittests/TextAPI/TextStubV4Tests.cpp | 6 +++--- 40 files changed, 89 insertions(+), 91 deletions(-) rename llvm/include/llvm/TextAPI/{MachO => }/Architecture.def (96%) rename llvm/include/llvm/TextAPI/{MachO => }/Architecture.h (93%) rename llvm/include/llvm/TextAPI/{MachO => }/ArchitectureSet.h (97%) rename llvm/include/llvm/TextAPI/{MachO => }/InterfaceFile.h (97%) rename llvm/include/llvm/TextAPI/{MachO => }/PackedVersion.h (96%) rename llvm/include/llvm/TextAPI/{MachO => }/Platform.h (95%) rename llvm/include/llvm/TextAPI/{MachO => }/Symbol.h (97%) rename llvm/include/llvm/TextAPI/{MachO => }/Target.h (93%) rename llvm/include/llvm/TextAPI/{MachO => }/TextAPIReader.h (100%) rename llvm/include/llvm/TextAPI/{MachO => }/TextAPIWriter.h (100%) rename llvm/lib/TextAPI/{MachO => }/Architecture.cpp (89%) rename llvm/lib/TextAPI/{MachO => }/ArchitectureSet.cpp (97%) rename llvm/lib/TextAPI/{MachO => }/InterfaceFile.cpp (99%) rename llvm/lib/TextAPI/{MachO => }/PackedVersion.cpp (98%) rename llvm/lib/TextAPI/{MachO => }/Platform.cpp (96%) rename llvm/lib/TextAPI/{MachO => }/Symbol.cpp (97%) rename llvm/lib/TextAPI/{MachO => }/Target.cpp (96%) rename llvm/lib/TextAPI/{MachO => }/TextAPIContext.h (100%) rename llvm/lib/TextAPI/{MachO => }/TextStub.cpp (99%) rename llvm/lib/TextAPI/{MachO => }/TextStubCommon.cpp (99%) rename llvm/lib/TextAPI/{MachO => }/TextStubCommon.h (93%) diff --git a/clang/docs/ClangFormattedStatus.rst b/clang/docs/ClangFormattedStatus.rst index 108351c..a936a8f 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 c629c84..5c9faa8 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 diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp index d0666d6..2a65c44 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 diff --git a/lld/MachO/DriverUtils.cpp b/lld/MachO/DriverUtils.cpp index fe1585f..064a509 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 a663a50..7bd9883 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 d9b3479..214f026 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 #include diff --git a/lld/lib/ReaderWriter/MachO/File.h b/lld/lib/ReaderWriter/MachO/File.h index 8d59656..7783296 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 namespace lld { diff --git a/llvm/include/llvm/Object/TapiFile.h b/llvm/include/llvm/Object/TapiFile.h index 8de164a..ffa27fd 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 bddfd4b..8f716ac 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 85ff690..58ef31b 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 7a9f951..3cd8a3a 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 74e091a..0901278 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 #include #include 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 9dc1204..d17c0c1 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 b98a3b1..e3d2bd5 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 fc59b86..7a81b49 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 4f7fb2d4..878befc 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 5fe44cb..c4c2a6d 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 48cb949..d73d93f 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 0c59880..e1901d5 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(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 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 f665706..0fc2ede 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 e0bf842..6dc3ccc 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 ad6f1d3..1156a39 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 #include 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 8405aba..f8171e0 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 f454c1c..d68a0dd 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 9f2d817..041f553c 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 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 6f8d9bb..4c33a58 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 68c0d6b..5d85342 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 #include 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 0d3614b..c2713b9 100644 --- a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp +++ b/llvm/lib/TextAPI/TextStubCommon.cpp @@ -134,7 +134,7 @@ void ScalarBitSetTraits::bitset(IO &IO, ArchitectureSet &Archs) { #define ARCHINFO(arch, type, subtype, numbits) \ IO.bitSetCase(Archs, #arch, 1U << static_cast(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 f2cda50..89ae5d5 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; diff --git a/llvm/tools/llvm-ifs/llvm-ifs.cpp b/llvm/tools/llvm-ifs/llvm-ifs.cpp index 5eda708..129dc89 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 #include #include diff --git a/llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp b/llvm/tools/llvm-libtool-darwin/llvm-libtool-darwin.cpp index f16b4a1..25f4296 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 using namespace llvm; diff --git a/llvm/tools/llvm-lipo/llvm-lipo.cpp b/llvm/tools/llvm-lipo/llvm-lipo.cpp index 7fbe489..7452eca 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 183dbf0..67bfa1a 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 #include diff --git a/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/llvm/unittests/TextAPI/TextStubV1Tests.cpp index 64b9769..7931070 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 #include diff --git a/llvm/unittests/TextAPI/TextStubV2Tests.cpp b/llvm/unittests/TextAPI/TextStubV2Tests.cpp index c9e54ac..873fc1f 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 #include diff --git a/llvm/unittests/TextAPI/TextStubV3Tests.cpp b/llvm/unittests/TextAPI/TextStubV3Tests.cpp index 8841b20..bad3b45 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 #include diff --git a/llvm/unittests/TextAPI/TextStubV4Tests.cpp b/llvm/unittests/TextAPI/TextStubV4Tests.cpp index 87dae84..620363c 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 #include -- 2.7.4