diff options
| author | Cyndy Ishida <cyndy_ishida@apple.com> | 2019-09-11 21:35:28 +0000 |
|---|---|---|
| committer | Cyndy Ishida <cyndy_ishida@apple.com> | 2019-09-11 21:35:28 +0000 |
| commit | bc40836a433dbc67b18b3faedbe39ff79628d3e1 (patch) | |
| tree | 83d1bafca10e9a931d5964843884d4c6d1446d07 /llvm/lib/TextAPI | |
| parent | 48eb4a27d1d1f2f6e7f6036d47fb282e6eb49310 (diff) | |
| download | llvm-bc40836a433dbc67b18b3faedbe39ff79628d3e1.zip llvm-bc40836a433dbc67b18b3faedbe39ff79628d3e1.tar.gz llvm-bc40836a433dbc67b18b3faedbe39ff79628d3e1.tar.bz2 | |
Revert [llvm-nm] Add tapi file support
This reverts r371576 (git commit f88f46358dbffa20af3b054a9346e5154789d50f)
llvm-svn: 371676
Diffstat (limited to 'llvm/lib/TextAPI')
| -rw-r--r-- | llvm/lib/TextAPI/MachO/Architecture.cpp | 25 | ||||
| -rw-r--r-- | llvm/lib/TextAPI/MachO/TextStubCommon.cpp | 2 |
2 files changed, 5 insertions, 22 deletions
diff --git a/llvm/lib/TextAPI/MachO/Architecture.cpp b/llvm/lib/TextAPI/MachO/Architecture.cpp index 4d55c99..a66a982 100644 --- a/llvm/lib/TextAPI/MachO/Architecture.cpp +++ b/llvm/lib/TextAPI/MachO/Architecture.cpp @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// #include "llvm/TextAPI/MachO/Architecture.h" -#include "llvm/TextAPI/MachO/ArchitectureSet.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/BinaryFormat/MachO.h" @@ -19,7 +18,7 @@ namespace llvm { namespace MachO { Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType) { -#define ARCHINFO(Arch, Type, Subtype, NumBits) \ +#define ARCHINFO(Arch, Type, Subtype) \ if (CPUType == (Type) && \ (CPUSubType & ~MachO::CPU_SUBTYPE_MASK) == (Subtype)) \ return AK_##Arch; @@ -31,7 +30,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) +#define ARCHINFO(Arch, Type, Subtype) .Case(#Arch, AK_##Arch) #include "llvm/TextAPI/MachO/Architecture.def" #undef ARCHINFO .Default(AK_unknown); @@ -39,7 +38,7 @@ Architecture getArchitectureFromName(StringRef Name) { StringRef getArchitectureName(Architecture Arch) { switch (Arch) { -#define ARCHINFO(Arch, Type, Subtype, NumBits) \ +#define ARCHINFO(Arch, Type, Subtype) \ case AK_##Arch: \ return #Arch; #include "llvm/TextAPI/MachO/Architecture.def" @@ -55,7 +54,7 @@ StringRef getArchitectureName(Architecture Arch) { std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) { switch (Arch) { -#define ARCHINFO(Arch, Type, Subtype, NumBits) \ +#define ARCHINFO(Arch, Type, Subtype) \ case AK_##Arch: \ return std::make_pair(Type, Subtype); #include "llvm/TextAPI/MachO/Architecture.def" @@ -69,22 +68,6 @@ std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) { return std::make_pair(0, 0); } -bool is64Bit(Architecture Arch) { - switch (Arch) { -#define ARCHINFO(Arch, Type, Subtype, NumBits) \ - case AK_##Arch: \ - return NumBits == 64; -#include "llvm/TextAPI/MachO/Architecture.def" -#undef ARCHINFO - case AK_unknown: - return false; - } - - // Appease some compilers that cannot figure out that this is a fully covered - // switch statement. - return false; -} - raw_ostream &operator<<(raw_ostream &OS, Architecture Arch) { OS << getArchitectureName(Arch); return OS; diff --git a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp b/llvm/lib/TextAPI/MachO/TextStubCommon.cpp index be25aef..00382cd 100644 --- a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp +++ b/llvm/lib/TextAPI/MachO/TextStubCommon.cpp @@ -84,7 +84,7 @@ QuotingType ScalarTraits<PlatformKind>::mustQuote(StringRef) { void ScalarBitSetTraits<ArchitectureSet>::bitset(IO &IO, ArchitectureSet &Archs) { -#define ARCHINFO(arch, type, subtype, numbits) \ +#define ARCHINFO(arch, type, subtype) \ IO.bitSetCase(Archs, #arch, 1U << static_cast<int>(AK_##arch)); #include "llvm/TextAPI/MachO/Architecture.def" #undef ARCHINFO |