Skip to content

Commit 5165593

Browse files
committed
Delete CloudABI support
After this D108637 and with FreeBSD -current and now 14 dropping support for CloudABI I think it is time to consider deleting the CloudABI support. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D158920
1 parent 09f4c69 commit 5165593

File tree

25 files changed

+3
-658
lines changed

25 files changed

+3
-658
lines changed

clang/docs/tools/clang-formatted-files.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
399399
clang/lib/Driver/ToolChains/AMDGPUOpenMP.h
400400
clang/lib/Driver/ToolChains/AVR.cpp
401401
clang/lib/Driver/ToolChains/AVR.h
402-
clang/lib/Driver/ToolChains/CloudABI.cpp
403402
clang/lib/Driver/ToolChains/CommonArgs.h
404403
clang/lib/Driver/ToolChains/CrossWindows.h
405404
clang/lib/Driver/ToolChains/DragonFly.h

clang/lib/Basic/Targets.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
142142
return std::make_unique<DarwinAArch64TargetInfo>(Triple, Opts);
143143

144144
switch (os) {
145-
case llvm::Triple::CloudABI:
146-
return std::make_unique<CloudABITargetInfo<AArch64leTargetInfo>>(Triple,
147-
Opts);
148145
case llvm::Triple::FreeBSD:
149146
return std::make_unique<FreeBSDTargetInfo<AArch64leTargetInfo>>(Triple,
150147
Opts);
@@ -202,9 +199,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
202199
return std::make_unique<DarwinARMTargetInfo>(Triple, Opts);
203200

204201
switch (os) {
205-
case llvm::Triple::CloudABI:
206-
return std::make_unique<CloudABITargetInfo<ARMleTargetInfo>>(Triple,
207-
Opts);
208202
case llvm::Triple::Linux:
209203
switch (Triple.getEnvironment()) {
210204
default:
@@ -541,9 +535,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
541535
return std::make_unique<DarwinI386TargetInfo>(Triple, Opts);
542536

543537
switch (os) {
544-
case llvm::Triple::CloudABI:
545-
return std::make_unique<CloudABITargetInfo<X86_32TargetInfo>>(Triple,
546-
Opts);
547538
case llvm::Triple::Linux: {
548539
switch (Triple.getEnvironment()) {
549540
default:
@@ -603,9 +594,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
603594
return std::make_unique<DarwinX86_64TargetInfo>(Triple, Opts);
604595

605596
switch (os) {
606-
case llvm::Triple::CloudABI:
607-
return std::make_unique<CloudABITargetInfo<X86_64TargetInfo>>(Triple,
608-
Opts);
609597
case llvm::Triple::Linux: {
610598
switch (Triple.getEnvironment()) {
611599
default:

clang/lib/Basic/Targets/OSTargets.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,6 @@ class LLVM_LIBRARY_VISIBILITY OSTargetInfo : public TgtInfo {
3434
}
3535
};
3636

37-
// CloudABI Target
38-
template <typename Target>
39-
class LLVM_LIBRARY_VISIBILITY CloudABITargetInfo : public OSTargetInfo<Target> {
40-
protected:
41-
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
42-
MacroBuilder &Builder) const override {
43-
Builder.defineMacro("__CloudABI__");
44-
45-
// CloudABI uses ISO/IEC 10646:2012 for wchar_t, char16_t and char32_t.
46-
Builder.defineMacro("__STDC_ISO_10646__", "201206L");
47-
}
48-
49-
public:
50-
using OSTargetInfo<Target>::OSTargetInfo;
51-
};
52-
5337
void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,
5438
const llvm::Triple &Triple, StringRef &PlatformName,
5539
VersionTuple &PlatformMinVersion);

clang/lib/Driver/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ add_clang_library(clangDriver
4747
ToolChains/AVR.cpp
4848
ToolChains/BareMetal.cpp
4949
ToolChains/Clang.cpp
50-
ToolChains/CloudABI.cpp
5150
ToolChains/CommonArgs.cpp
5251
ToolChains/CrossWindows.cpp
5352
ToolChains/CSKYToolChain.cpp

clang/lib/Driver/Driver.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "ToolChains/BareMetal.h"
1616
#include "ToolChains/CSKYToolChain.h"
1717
#include "ToolChains/Clang.h"
18-
#include "ToolChains/CloudABI.h"
1918
#include "ToolChains/CrossWindows.h"
2019
#include "ToolChains/Cuda.h"
2120
#include "ToolChains/Darwin.h"
@@ -6150,9 +6149,6 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
61506149
case llvm::Triple::Haiku:
61516150
TC = std::make_unique<toolchains::Haiku>(*this, Target, Args);
61526151
break;
6153-
case llvm::Triple::CloudABI:
6154-
TC = std::make_unique<toolchains::CloudABI>(*this, Target, Args);
6155-
break;
61566152
case llvm::Triple::Darwin:
61576153
case llvm::Triple::MacOSX:
61586154
case llvm::Triple::IOS:

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,7 @@ static bool useFramePointerForTargetByDefault(const ArgList &Args,
466466
return !areOptimizationsEnabled(Args);
467467
}
468468

469-
if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
470-
Triple.isOSHurd()) {
469+
if (Triple.isOSLinux() || Triple.isOSHurd()) {
471470
switch (Triple.getArch()) {
472471
// Don't use a frame pointer on linux if optimizing for certain targets.
473472
case llvm::Triple::arm:

clang/lib/Driver/ToolChains/CloudABI.cpp

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

clang/lib/Driver/ToolChains/CloudABI.h

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

clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,9 +584,9 @@ llvm::StringRef tools::getLTOParallelism(const ArgList &Args, const Driver &D) {
584584
return LtoJobsArg->getValue();
585585
}
586586

587-
// CloudABI and PS4/PS5 use -ffunction-sections and -fdata-sections by default.
587+
// PS4/PS5 uses -ffunction-sections and -fdata-sections by default.
588588
bool tools::isUseSeparateSections(const llvm::Triple &Triple) {
589-
return Triple.getOS() == llvm::Triple::CloudABI || Triple.isPS();
589+
return Triple.isPS();
590590
}
591591

592592
void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,

clang/lib/Lex/InitHeaderSearch.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
231231

232232
if (HSOpts.UseStandardSystemIncludes) {
233233
switch (os) {
234-
case llvm::Triple::CloudABI:
235234
case llvm::Triple::ELFIAMCU:
236235
break;
237236
case llvm::Triple::Win32:
@@ -271,13 +270,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
271270
}
272271

273272
switch (os) {
274-
case llvm::Triple::CloudABI: {
275-
// <sysroot>/<triple>/include
276-
SmallString<128> P = StringRef(HSOpts.ResourceDir);
277-
llvm::sys::path::append(P, "../../..", triple.str(), "include");
278-
AddPath(P, System, false);
279-
break;
280-
}
281273
case llvm::Triple::RTEMS:
282274
break;
283275
case llvm::Triple::Win32:
@@ -295,7 +287,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
295287
}
296288

297289
switch (os) {
298-
case llvm::Triple::CloudABI:
299290
case llvm::Triple::RTEMS:
300291
case llvm::Triple::ELFIAMCU:
301292
break;

clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ using namespace ento;
2727
static bool isArc4RandomAvailable(const ASTContext &Ctx) {
2828
const llvm::Triple &T = Ctx.getTargetInfo().getTriple();
2929
return T.getVendor() == llvm::Triple::Apple ||
30-
T.getOS() == llvm::Triple::CloudABI ||
3130
T.isOSFreeBSD() ||
3231
T.isOSNetBSD() ||
3332
T.isOSOpenBSD() ||

0 commit comments

Comments
 (0)