Skip to content

Commit e86740e

Browse files
authored
[clang] Add managarm support (#139271)
This PR is part of a series to upstream managarm support, as laid out in the [RFC](https://discourse.llvm.org/t/rfc-new-proposed-managarm-support-for-llvm-and-clang-87845/85884/1). This PR is a follow-up to #87845 and #138854.
1 parent 98c6c37 commit e86740e

File tree

35 files changed

+595
-0
lines changed

35 files changed

+595
-0
lines changed

clang/lib/Basic/Targets.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ 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);
167170
case llvm::Triple::NetBSD:
168171
return std::make_unique<NetBSDTargetInfo<AArch64leTargetInfo>>(Triple,
169172
Opts);
@@ -466,6 +469,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
466469
return std::make_unique<OHOSTargetInfo<RISCV64TargetInfo>>(Triple,
467470
Opts);
468471
}
472+
case llvm::Triple::Managarm:
473+
return std::make_unique<ManagarmTargetInfo<RISCV64TargetInfo>>(Triple,
474+
Opts);
469475
default:
470476
return std::make_unique<RISCV64TargetInfo>(Triple, Opts);
471477
}
@@ -654,6 +660,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
654660
return std::make_unique<PS5OSTargetInfo<X86_64TargetInfo>>(Triple, Opts);
655661
case llvm::Triple::Hurd:
656662
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);
657666
default:
658667
return std::make_unique<X86_64TargetInfo>(Triple, Opts);
659668
}

clang/lib/Basic/Targets/OSTargets.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,36 @@ 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+
398428
// NetBSD Target
399429
template <typename Target>
400430
class LLVM_LIBRARY_VISIBILITY NetBSDTargetInfo : public OSTargetInfo<Target> {

clang/lib/Driver/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ add_clang_library(clangDriver
6666
ToolChains/HLSL.cpp
6767
ToolChains/Hurd.cpp
6868
ToolChains/Linux.cpp
69+
ToolChains/Managarm.cpp
6970
ToolChains/MipsLinux.cpp
7071
ToolChains/MinGW.cpp
7172
ToolChains/MSP430.cpp

clang/lib/Driver/Driver.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "ToolChains/Linux.h"
3434
#include "ToolChains/MSP430.h"
3535
#include "ToolChains/MSVC.h"
36+
#include "ToolChains/Managarm.h"
3637
#include "ToolChains/MinGW.h"
3738
#include "ToolChains/MipsLinux.h"
3839
#include "ToolChains/NaCl.h"
@@ -6842,6 +6843,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
68426843
case llvm::Triple::Fuchsia:
68436844
TC = std::make_unique<toolchains::Fuchsia>(*this, Target, Args);
68446845
break;
6846+
case llvm::Triple::Managarm:
6847+
TC = std::make_unique<toolchains::Managarm>(*this, Target, Args);
6848+
break;
68456849
case llvm::Triple::Solaris:
68466850
TC = std::make_unique<toolchains::Solaris>(*this, Target, Args);
68476851
break;

clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ 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";
229231
return "aarch64linux";
230232
case llvm::Triple::aarch64_be:
231233
return "aarch64linuxb";
Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "Managarm.h"
10+
#include "Arch/ARM.h"
11+
#include "Arch/RISCV.h"
12+
#include "clang/Config/config.h"
13+
#include "clang/Driver/CommonArgs.h"
14+
#include "clang/Driver/Driver.h"
15+
#include "clang/Driver/Options.h"
16+
#include "clang/Driver/SanitizerArgs.h"
17+
#include "llvm/Option/ArgList.h"
18+
#include "llvm/Support/Path.h"
19+
20+
using namespace clang::driver;
21+
using namespace clang::driver::toolchains;
22+
using namespace clang;
23+
using namespace llvm::opt;
24+
25+
using tools::addPathIfExists;
26+
27+
std::string Managarm::getMultiarchTriple(const Driver &D,
28+
const llvm::Triple &TargetTriple,
29+
StringRef SysRoot) const {
30+
switch (TargetTriple.getArch()) {
31+
default:
32+
return TargetTriple.str();
33+
case llvm::Triple::x86_64:
34+
return "x86_64-managarm-" + TargetTriple.getEnvironmentName().str();
35+
case llvm::Triple::aarch64:
36+
return "aarch64-managarm-" + TargetTriple.getEnvironmentName().str();
37+
case llvm::Triple::riscv64:
38+
return "riscv64-managarm-" + TargetTriple.getEnvironmentName().str();
39+
}
40+
}
41+
42+
static StringRef getOSLibDir(const llvm::Triple &Triple, const ArgList &Args) {
43+
// It happens that only x86, PPC and SPARC use the 'lib32' variant of
44+
// oslibdir, and using that variant while targeting other architectures causes
45+
// problems because the libraries are laid out in shared system roots that
46+
// can't cope with a 'lib32' library search path being considered. So we only
47+
// enable them when we know we may need it.
48+
//
49+
// FIXME: This is a bit of a hack. We should really unify this code for
50+
// reasoning about oslibdir spellings with the lib dir spellings in the
51+
// GCCInstallationDetector, but that is a more significant refactoring.
52+
if (Triple.getArch() == llvm::Triple::x86 || Triple.isPPC32() ||
53+
Triple.getArch() == llvm::Triple::sparc)
54+
return "lib32";
55+
56+
if (Triple.getArch() == llvm::Triple::x86_64 && Triple.isX32())
57+
return "libx32";
58+
59+
if (Triple.getArch() == llvm::Triple::riscv32)
60+
return "lib32";
61+
62+
return Triple.isArch32Bit() ? "lib" : "lib64";
63+
}
64+
65+
Managarm::Managarm(const Driver &D, const llvm::Triple &Triple,
66+
const ArgList &Args)
67+
: Generic_ELF(D, Triple, Args) {
68+
GCCInstallation.init(Triple, Args);
69+
Multilibs = GCCInstallation.getMultilibs();
70+
SelectedMultilibs.assign({GCCInstallation.getMultilib()});
71+
std::string SysRoot = computeSysRoot();
72+
73+
ToolChain::path_list &PPaths = getProgramPaths();
74+
75+
Generic_GCC::PushPPaths(PPaths);
76+
77+
#ifdef ENABLE_LINKER_BUILD_ID
78+
ExtraOpts.push_back("--build-id");
79+
#endif
80+
81+
// The selection of paths to try here is designed to match the patterns which
82+
// the GCC driver itself uses, as this is part of the GCC-compatible driver.
83+
// This was determined by running GCC in a fake filesystem, creating all
84+
// possible permutations of these directories, and seeing which ones it added
85+
// to the link paths.
86+
path_list &Paths = getFilePaths();
87+
88+
const std::string OSLibDir = std::string(getOSLibDir(Triple, Args));
89+
const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot);
90+
91+
Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths);
92+
93+
addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths);
94+
addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths);
95+
addPathIfExists(D, concat(SysRoot, "/usr/lib", MultiarchTriple), Paths);
96+
addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir), Paths);
97+
98+
Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths);
99+
100+
addPathIfExists(D, concat(SysRoot, "/lib"), Paths);
101+
addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths);
102+
}
103+
104+
bool Managarm::HasNativeLLVMSupport() const { return true; }
105+
106+
Tool *Managarm::buildLinker() const {
107+
return new tools::gnutools::Linker(*this);
108+
}
109+
110+
Tool *Managarm::buildAssembler() const {
111+
return new tools::gnutools::Assembler(*this);
112+
}
113+
114+
std::string Managarm::computeSysRoot() const {
115+
if (!getDriver().SysRoot.empty())
116+
return getDriver().SysRoot;
117+
return std::string();
118+
}
119+
120+
std::string Managarm::getDynamicLinker(const ArgList &Args) const {
121+
switch (getTriple().getArch()) {
122+
case llvm::Triple::aarch64:
123+
return "/lib/aarch64-managarm/ld.so";
124+
case llvm::Triple::riscv64: {
125+
StringRef ABIName = tools::riscv::getRISCVABI(Args, getTriple());
126+
return ("/lib/riscv64-managarm/ld-riscv64-" + ABIName + ".so").str();
127+
}
128+
case llvm::Triple::x86_64:
129+
return "/lib/x86_64-managarm/ld.so";
130+
default:
131+
llvm_unreachable("unsupported architecture");
132+
}
133+
}
134+
135+
void Managarm::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
136+
ArgStringList &CC1Args) const {
137+
const Driver &D = getDriver();
138+
std::string SysRoot = computeSysRoot();
139+
140+
if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc))
141+
return;
142+
143+
if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
144+
addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
145+
146+
// Add 'include' in the resource directory, which is similar to
147+
// GCC_INCLUDE_DIR (private headers) in GCC.
148+
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
149+
SmallString<128> ResourceDirInclude(D.ResourceDir);
150+
llvm::sys::path::append(ResourceDirInclude, "include");
151+
addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
152+
}
153+
154+
if (DriverArgs.hasArg(options::OPT_nostdlibinc))
155+
return;
156+
157+
// TOOL_INCLUDE_DIR
158+
AddMultilibIncludeArgs(DriverArgs, CC1Args);
159+
160+
// Check for configure-time C include directories.
161+
StringRef CIncludeDirs(C_INCLUDE_DIRS);
162+
if (CIncludeDirs != "") {
163+
SmallVector<StringRef, 5> dirs;
164+
CIncludeDirs.split(dirs, ":");
165+
for (StringRef dir : dirs) {
166+
StringRef Prefix =
167+
llvm::sys::path::is_absolute(dir) ? StringRef(SysRoot) : "";
168+
addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);
169+
}
170+
return;
171+
}
172+
173+
// On systems using multiarch, add /usr/include/$triple before
174+
// /usr/include.
175+
std::string MultiarchIncludeDir = getMultiarchTriple(D, getTriple(), SysRoot);
176+
if (!MultiarchIncludeDir.empty())
177+
addExternCSystemInclude(
178+
DriverArgs, CC1Args,
179+
concat(SysRoot, "/usr/include", MultiarchIncludeDir));
180+
181+
// Add an include of '/include' directly. This isn't provided by default by
182+
// system GCCs, but is often used with cross-compiling GCCs, and harmless to
183+
// add even when Clang is acting as-if it were a system compiler.
184+
addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
185+
186+
addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include"));
187+
}
188+
189+
void Managarm::addLibStdCxxIncludePaths(
190+
const llvm::opt::ArgList &DriverArgs,
191+
llvm::opt::ArgStringList &CC1Args) const {
192+
// We need a detected GCC installation on Managarm to provide libstdc++'s
193+
// headers.
194+
if (!GCCInstallation.isValid())
195+
return;
196+
197+
StringRef TripleStr = GCCInstallation.getTriple().str();
198+
199+
// Try generic GCC detection.
200+
Generic_GCC::addGCCLibStdCxxIncludePaths(DriverArgs, CC1Args, TripleStr);
201+
}
202+
203+
SanitizerMask Managarm::getSupportedSanitizers() const {
204+
const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
205+
SanitizerMask Res = ToolChain::getSupportedSanitizers();
206+
Res |= SanitizerKind::PointerCompare;
207+
Res |= SanitizerKind::PointerSubtract;
208+
Res |= SanitizerKind::KernelAddress;
209+
Res |= SanitizerKind::Vptr;
210+
if (IsX86_64)
211+
Res |= SanitizerKind::KernelMemory;
212+
return Res;
213+
}
214+
215+
void Managarm::addExtraOpts(llvm::opt::ArgStringList &CmdArgs) const {
216+
for (const auto &Opt : ExtraOpts)
217+
CmdArgs.push_back(Opt.c_str());
218+
}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
//===--- Managarm.h - Managarm ToolChain Implementations --------*- C++ -*-===//
2+
//
3+
// The LLVM Compiler Infrastructure
4+
//
5+
// This file is distributed under the University of Illinois Open Source
6+
// License. See LICENSE.TXT for details.
7+
//
8+
//===----------------------------------------------------------------------===//
9+
10+
#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MANAGARM_H
11+
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MANAGARM_H
12+
13+
#include "Gnu.h"
14+
#include "clang/Driver/ToolChain.h"
15+
16+
namespace clang {
17+
namespace driver {
18+
namespace toolchains {
19+
20+
class LLVM_LIBRARY_VISIBILITY Managarm : public Generic_ELF {
21+
public:
22+
Managarm(const Driver &D, const llvm::Triple &Triple,
23+
const llvm::opt::ArgList &Args);
24+
25+
bool HasNativeLLVMSupport() const override;
26+
27+
std::string getMultiarchTriple(const Driver &D,
28+
const llvm::Triple &TargetTriple,
29+
StringRef SysRoot) const override;
30+
31+
void
32+
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
33+
llvm::opt::ArgStringList &CC1Args) const override;
34+
void
35+
addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
36+
llvm::opt::ArgStringList &CC1Args) const override;
37+
SanitizerMask getSupportedSanitizers() const override;
38+
std::string computeSysRoot() const override;
39+
40+
std::string getDynamicLinker(const llvm::opt::ArgList &Args) const override;
41+
42+
void addExtraOpts(llvm::opt::ArgStringList &CmdArgs) const override;
43+
44+
std::vector<std::string> ExtraOpts;
45+
46+
protected:
47+
Tool *buildAssembler() const override;
48+
Tool *buildLinker() const override;
49+
};
50+
51+
} // end namespace toolchains
52+
} // end namespace driver
53+
} // end namespace clang
54+
55+
#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MANAGARM_H

clang/lib/Lex/InitHeaderSearch.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ bool InitHeaderSearch::ShouldAddDefaultIncludePaths(
221221
case llvm::Triple::Hurd:
222222
case llvm::Triple::Linux:
223223
case llvm::Triple::LiteOS:
224+
case llvm::Triple::Managarm:
224225
case llvm::Triple::NaCl:
225226
case llvm::Triple::NetBSD:
226227
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)