Skip to content

Revert "[clang] Add managarm support" #144514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions clang/lib/Basic/Targets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
return std::make_unique<OHOSTargetInfo<AArch64leTargetInfo>>(Triple,
Opts);
}
case llvm::Triple::Managarm:
return std::make_unique<ManagarmTargetInfo<AArch64leTargetInfo>>(Triple,
Opts);
case llvm::Triple::NetBSD:
return std::make_unique<NetBSDTargetInfo<AArch64leTargetInfo>>(Triple,
Opts);
Expand Down Expand Up @@ -469,9 +466,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
return std::make_unique<OHOSTargetInfo<RISCV64TargetInfo>>(Triple,
Opts);
}
case llvm::Triple::Managarm:
return std::make_unique<ManagarmTargetInfo<RISCV64TargetInfo>>(Triple,
Opts);
default:
return std::make_unique<RISCV64TargetInfo>(Triple, Opts);
}
Expand Down Expand Up @@ -660,9 +654,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
return std::make_unique<PS5OSTargetInfo<X86_64TargetInfo>>(Triple, Opts);
case llvm::Triple::Hurd:
return std::make_unique<HurdTargetInfo<X86_64TargetInfo>>(Triple, Opts);
case llvm::Triple::Managarm:
return std::make_unique<ManagarmTargetInfo<X86_64TargetInfo>>(Triple,
Opts);
default:
return std::make_unique<X86_64TargetInfo>(Triple, Opts);
}
Expand Down
30 changes: 0 additions & 30 deletions clang/lib/Basic/Targets/OSTargets.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,36 +395,6 @@ class LLVM_LIBRARY_VISIBILITY LinuxTargetInfo : public OSTargetInfo<Target> {
}
};

// Managarm Target
template <typename Target>
class LLVM_LIBRARY_VISIBILITY ManagarmTargetInfo : public OSTargetInfo<Target> {
protected:
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
MacroBuilder &Builder) const override {
DefineStd(Builder, "unix", Opts);
Builder.defineMacro("__managarm__");
if (Opts.POSIXThreads)
Builder.defineMacro("_REENTRANT");
if (Opts.CPlusPlus)
Builder.defineMacro("_GNU_SOURCE");
if (this->HasFloat128)
Builder.defineMacro("__FLOAT128__");
}

public:
ManagarmTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
: OSTargetInfo<Target>(Triple, Opts) {
switch (Triple.getArch()) {
default:
break;
case llvm::Triple::x86:
case llvm::Triple::x86_64:
this->HasFloat128 = true;
break;
}
}
};

// NetBSD Target
template <typename Target>
class LLVM_LIBRARY_VISIBILITY NetBSDTargetInfo : public OSTargetInfo<Target> {
Expand Down
1 change: 0 additions & 1 deletion clang/lib/Driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ add_clang_library(clangDriver
ToolChains/HLSL.cpp
ToolChains/Hurd.cpp
ToolChains/Linux.cpp
ToolChains/Managarm.cpp
ToolChains/MipsLinux.cpp
ToolChains/MinGW.cpp
ToolChains/MSP430.cpp
Expand Down
4 changes: 0 additions & 4 deletions clang/lib/Driver/Driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "ToolChains/Linux.h"
#include "ToolChains/MSP430.h"
#include "ToolChains/MSVC.h"
#include "ToolChains/Managarm.h"
#include "ToolChains/MinGW.h"
#include "ToolChains/MipsLinux.h"
#include "ToolChains/NaCl.h"
Expand Down Expand Up @@ -6851,9 +6850,6 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
case llvm::Triple::Fuchsia:
TC = std::make_unique<toolchains::Fuchsia>(*this, Target, Args);
break;
case llvm::Triple::Managarm:
TC = std::make_unique<toolchains::Managarm>(*this, Target, Args);
break;
case llvm::Triple::Solaris:
TC = std::make_unique<toolchains::Solaris>(*this, Target, Args);
break;
Expand Down
2 changes: 0 additions & 2 deletions clang/lib/Driver/ToolChains/Gnu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,6 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
return "elf_iamcu";
return "elf_i386";
case llvm::Triple::aarch64:
if (T.isOSManagarm())
return "aarch64managarm";
return "aarch64linux";
case llvm::Triple::aarch64_be:
return "aarch64linuxb";
Expand Down
218 changes: 0 additions & 218 deletions clang/lib/Driver/ToolChains/Managarm.cpp

This file was deleted.

55 changes: 0 additions & 55 deletions clang/lib/Driver/ToolChains/Managarm.h

This file was deleted.

1 change: 0 additions & 1 deletion clang/lib/Lex/InitHeaderSearch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ bool InitHeaderSearch::ShouldAddDefaultIncludePaths(
case llvm::Triple::Hurd:
case llvm::Triple::Linux:
case llvm::Triple::LiteOS:
case llvm::Triple::Managarm:
case llvm::Triple::NaCl:
case llvm::Triple::NetBSD:
case llvm::Triple::OpenBSD:
Expand Down
Empty file.
Empty file.
Empty file.
Loading
Loading