Skip to content

Commit 3377b56

Browse files
authored
Revert "[clang] Add managarm support" (#144514)
Reverts #139271 There are multiple failing build bots: https://lab.llvm.org/buildbot/#/builders/10/builds/7482 https://lab.llvm.org/buildbot/#/builders/11/builds/17473
1 parent cb011d3 commit 3377b56

File tree

35 files changed

+0
-595
lines changed

35 files changed

+0
-595
lines changed

clang/lib/Basic/Targets.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
164164
return std::make_unique<OHOSTargetInfo<AArch64leTargetInfo>>(Triple,
165165
Opts);
166166
}
167-
case llvm::Triple::Managarm:
168-
return std::make_unique<ManagarmTargetInfo<AArch64leTargetInfo>>(Triple,
169-
Opts);
170167
case llvm::Triple::NetBSD:
171168
return std::make_unique<NetBSDTargetInfo<AArch64leTargetInfo>>(Triple,
172169
Opts);
@@ -469,9 +466,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
469466
return std::make_unique<OHOSTargetInfo<RISCV64TargetInfo>>(Triple,
470467
Opts);
471468
}
472-
case llvm::Triple::Managarm:
473-
return std::make_unique<ManagarmTargetInfo<RISCV64TargetInfo>>(Triple,
474-
Opts);
475469
default:
476470
return std::make_unique<RISCV64TargetInfo>(Triple, Opts);
477471
}
@@ -660,9 +654,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
660654
return std::make_unique<PS5OSTargetInfo<X86_64TargetInfo>>(Triple, Opts);
661655
case llvm::Triple::Hurd:
662656
return std::make_unique<HurdTargetInfo<X86_64TargetInfo>>(Triple, Opts);
663-
case llvm::Triple::Managarm:
664-
return std::make_unique<ManagarmTargetInfo<X86_64TargetInfo>>(Triple,
665-
Opts);
666657
default:
667658
return std::make_unique<X86_64TargetInfo>(Triple, Opts);
668659
}

clang/lib/Basic/Targets/OSTargets.h

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -395,36 +395,6 @@ class LLVM_LIBRARY_VISIBILITY LinuxTargetInfo : public OSTargetInfo<Target> {
395395
}
396396
};
397397

398-
// Managarm Target
399-
template <typename Target>
400-
class LLVM_LIBRARY_VISIBILITY ManagarmTargetInfo : public OSTargetInfo<Target> {
401-
protected:
402-
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
403-
MacroBuilder &Builder) const override {
404-
DefineStd(Builder, "unix", Opts);
405-
Builder.defineMacro("__managarm__");
406-
if (Opts.POSIXThreads)
407-
Builder.defineMacro("_REENTRANT");
408-
if (Opts.CPlusPlus)
409-
Builder.defineMacro("_GNU_SOURCE");
410-
if (this->HasFloat128)
411-
Builder.defineMacro("__FLOAT128__");
412-
}
413-
414-
public:
415-
ManagarmTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
416-
: OSTargetInfo<Target>(Triple, Opts) {
417-
switch (Triple.getArch()) {
418-
default:
419-
break;
420-
case llvm::Triple::x86:
421-
case llvm::Triple::x86_64:
422-
this->HasFloat128 = true;
423-
break;
424-
}
425-
}
426-
};
427-
428398
// NetBSD Target
429399
template <typename Target>
430400
class LLVM_LIBRARY_VISIBILITY NetBSDTargetInfo : public OSTargetInfo<Target> {

clang/lib/Driver/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ add_clang_library(clangDriver
6666
ToolChains/HLSL.cpp
6767
ToolChains/Hurd.cpp
6868
ToolChains/Linux.cpp
69-
ToolChains/Managarm.cpp
7069
ToolChains/MipsLinux.cpp
7170
ToolChains/MinGW.cpp
7271
ToolChains/MSP430.cpp

clang/lib/Driver/Driver.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "ToolChains/Linux.h"
3434
#include "ToolChains/MSP430.h"
3535
#include "ToolChains/MSVC.h"
36-
#include "ToolChains/Managarm.h"
3736
#include "ToolChains/MinGW.h"
3837
#include "ToolChains/MipsLinux.h"
3938
#include "ToolChains/NaCl.h"
@@ -6851,9 +6850,6 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
68516850
case llvm::Triple::Fuchsia:
68526851
TC = std::make_unique<toolchains::Fuchsia>(*this, Target, Args);
68536852
break;
6854-
case llvm::Triple::Managarm:
6855-
TC = std::make_unique<toolchains::Managarm>(*this, Target, Args);
6856-
break;
68576853
case llvm::Triple::Solaris:
68586854
TC = std::make_unique<toolchains::Solaris>(*this, Target, Args);
68596855
break;

clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
226226
return "elf_iamcu";
227227
return "elf_i386";
228228
case llvm::Triple::aarch64:
229-
if (T.isOSManagarm())
230-
return "aarch64managarm";
231229
return "aarch64linux";
232230
case llvm::Triple::aarch64_be:
233231
return "aarch64linuxb";

clang/lib/Driver/ToolChains/Managarm.cpp

Lines changed: 0 additions & 218 deletions
This file was deleted.

clang/lib/Driver/ToolChains/Managarm.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

clang/lib/Lex/InitHeaderSearch.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ bool InitHeaderSearch::ShouldAddDefaultIncludePaths(
221221
case llvm::Triple::Hurd:
222222
case llvm::Triple::Linux:
223223
case llvm::Triple::LiteOS:
224-
case llvm::Triple::Managarm:
225224
case llvm::Triple::NaCl:
226225
case llvm::Triple::NetBSD:
227226
case llvm::Triple::OpenBSD:

clang/test/Driver/Inputs/basic_managarm_tree/lib/aarch64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/lib/riscv64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/lib/x86_64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/lib64/aarch64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/lib64/riscv64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/lib64/x86_64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/include/aarch64-managarm-mlibc/c++/10/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/include/c++/10/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/include/c++/v1/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/include/riscv64-managarm-mlibc/c++/10/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/include/x86_64-managarm-mlibc/c++/10/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/aarch64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/aarch64-managarm-mlibc/10/crtbegin.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/aarch64-managarm-mlibc/10/crtbeginS.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/aarch64-managarm-mlibc/10/crtbeginT.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/riscv64-managarm-mlibc/10/crtbegin.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/riscv64-managarm-mlibc/10/crtbeginS.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/riscv64-managarm-mlibc/10/crtbeginT.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/x86_64-managarm-mlibc/10/crtbegin.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/x86_64-managarm-mlibc/10/crtbeginS.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/gcc/x86_64-managarm-mlibc/10/crtbeginT.o

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/riscv64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib/x86_64-managarm-mlibc/.keep

Whitespace-only changes.

clang/test/Driver/Inputs/basic_managarm_tree/usr/lib64/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)