Skip to content

Commit 0d2e11f

Browse files
brad0brad0
authored
Remove Native Client support (llvm#133661)
Remove the Native Client support now that it has finally reached end of life.
1 parent 0967957 commit 0d2e11f

File tree

99 files changed

+51
-2557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+51
-2557
lines changed

‎clang/include/clang/Basic/TargetInfo.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,6 @@ class TargetInfo : public TransferrableTargetInfo,
337337
/// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055a/IHI0055A_aapcs64.pdf
338338
AArch64ABIBuiltinVaList,
339339

340-
/// __builtin_va_list as defined by the PNaCl ABI:
341-
/// http://www.chromium.org/nativeclient/pnacl/bitcode-abi#TOC-Machine-Types
342-
PNaClABIBuiltinVaList,
343-
344340
/// __builtin_va_list as defined by the Power ABI:
345341
/// https://www.power.org
346342
/// /resources/downloads/Power-Arch-32-bit-ABI-supp-1.0-Embedded.pdf

‎clang/lib/AST/ASTContext.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9998,14 +9998,6 @@ CreateX86_64ABIBuiltinVaListDecl(const ASTContext *Context) {
99989998
return Context->buildImplicitTypedef(VaListTagArrayType, "__builtin_va_list");
99999999
}
1000010000

10001-
static TypedefDecl *CreatePNaClABIBuiltinVaListDecl(const ASTContext *Context) {
10002-
// typedef int __builtin_va_list[4];
10003-
llvm::APInt Size(Context->getTypeSize(Context->getSizeType()), 4);
10004-
QualType IntArrayType = Context->getConstantArrayType(
10005-
Context->IntTy, Size, nullptr, ArraySizeModifier::Normal, 0);
10006-
return Context->buildImplicitTypedef(IntArrayType, "__builtin_va_list");
10007-
}
10008-
1000910001
static TypedefDecl *
1001010002
CreateAAPCSABIBuiltinVaListDecl(const ASTContext *Context) {
1001110003
// struct __va_list
@@ -10203,8 +10195,6 @@ static TypedefDecl *CreateVaListDecl(const ASTContext *Context,
1020310195
return CreatePowerABIBuiltinVaListDecl(Context);
1020410196
case TargetInfo::X86_64ABIBuiltinVaList:
1020510197
return CreateX86_64ABIBuiltinVaListDecl(Context);
10206-
case TargetInfo::PNaClABIBuiltinVaList:
10207-
return CreatePNaClABIBuiltinVaListDecl(Context);
1020810198
case TargetInfo::AAPCSABIBuiltinVaList:
1020910199
return CreateAAPCSABIBuiltinVaListDecl(Context);
1021010200
case TargetInfo::SystemZBuiltinVaList:

‎clang/lib/Basic/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ add_clang_library(clangBasic
111111
Targets/Mips.cpp
112112
Targets/NVPTX.cpp
113113
Targets/OSTargets.cpp
114-
Targets/PNaCl.cpp
115114
Targets/PPC.cpp
116115
Targets/RISCV.cpp
117116
Targets/SPIR.cpp

‎clang/lib/Basic/Targets.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "Targets/Mips.h"
3030
#include "Targets/NVPTX.h"
3131
#include "Targets/OSTargets.h"
32-
#include "Targets/PNaCl.h"
3332
#include "Targets/PPC.h"
3433
#include "Targets/RISCV.h"
3534
#include "Targets/SPIR.h"
@@ -228,8 +227,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
228227
return std::make_unique<RTEMSTargetInfo<ARMleTargetInfo>>(Triple, Opts);
229228
case llvm::Triple::Haiku:
230229
return std::make_unique<HaikuTargetInfo<ARMleTargetInfo>>(Triple, Opts);
231-
case llvm::Triple::NaCl:
232-
return std::make_unique<NaClTargetInfo<ARMleTargetInfo>>(Triple, Opts);
233230
case llvm::Triple::Win32:
234231
switch (Triple.getEnvironment()) {
235232
case llvm::Triple::Cygnus:
@@ -260,8 +257,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
260257
return std::make_unique<NetBSDTargetInfo<ARMbeTargetInfo>>(Triple, Opts);
261258
case llvm::Triple::RTEMS:
262259
return std::make_unique<RTEMSTargetInfo<ARMbeTargetInfo>>(Triple, Opts);
263-
case llvm::Triple::NaCl:
264-
return std::make_unique<NaClTargetInfo<ARMbeTargetInfo>>(Triple, Opts);
265260
default:
266261
return std::make_unique<ARMbeTargetInfo>(Triple, Opts);
267262
}
@@ -304,9 +299,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
304299
return std::make_unique<FreeBSDTargetInfo<MipsTargetInfo>>(Triple, Opts);
305300
case llvm::Triple::NetBSD:
306301
return std::make_unique<NetBSDTargetInfo<MipsTargetInfo>>(Triple, Opts);
307-
case llvm::Triple::NaCl:
308-
return std::make_unique<NaClTargetInfo<NaClMips32TargetInfo>>(Triple,
309-
Opts);
310302
case llvm::Triple::Win32:
311303
switch (Triple.getEnvironment()) {
312304
case llvm::Triple::GNU:
@@ -591,8 +583,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
591583
return std::make_unique<HaikuX86_32TargetInfo>(Triple, Opts);
592584
case llvm::Triple::RTEMS:
593585
return std::make_unique<RTEMSX86_32TargetInfo>(Triple, Opts);
594-
case llvm::Triple::NaCl:
595-
return std::make_unique<NaClTargetInfo<X86_32TargetInfo>>(Triple, Opts);
596586
case llvm::Triple::ELFIAMCU:
597587
return std::make_unique<MCUX86_32TargetInfo>(Triple, Opts);
598588
case llvm::Triple::Hurd:
@@ -652,8 +642,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
652642
}
653643
case llvm::Triple::Haiku:
654644
return std::make_unique<HaikuTargetInfo<X86_64TargetInfo>>(Triple, Opts);
655-
case llvm::Triple::NaCl:
656-
return std::make_unique<NaClTargetInfo<X86_64TargetInfo>>(Triple, Opts);
657645
case llvm::Triple::PS4:
658646
return std::make_unique<PS4OSTargetInfo<X86_64TargetInfo>>(Triple, Opts);
659647
case llvm::Triple::PS5:

‎clang/lib/Basic/Targets/ARM.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ void ARMTargetInfo::setABIAAPCS() {
5757
"-a:0:32"
5858
"-n32"
5959
"-S64");
60-
} else if (T.isOSNaCl()) {
61-
assert(!BigEndian && "NaCl on ARM does not support big endian");
62-
resetDataLayout("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S128");
6360
} else {
6461
resetDataLayout(BigEndian
6562
? "E-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"

‎clang/lib/Basic/Targets/OSTargets.h‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -865,53 +865,6 @@ class LLVM_LIBRARY_VISIBILITY WindowsTargetInfo : public OSTargetInfo<Target> {
865865
}
866866
};
867867

868-
template <typename Target>
869-
class LLVM_LIBRARY_VISIBILITY NaClTargetInfo : public OSTargetInfo<Target> {
870-
protected:
871-
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
872-
MacroBuilder &Builder) const override {
873-
if (Opts.POSIXThreads)
874-
Builder.defineMacro("_REENTRANT");
875-
if (Opts.CPlusPlus)
876-
Builder.defineMacro("_GNU_SOURCE");
877-
878-
DefineStd(Builder, "unix", Opts);
879-
Builder.defineMacro("__native_client__");
880-
}
881-
882-
public:
883-
NaClTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
884-
: OSTargetInfo<Target>(Triple, Opts) {
885-
this->LongAlign = 32;
886-
this->LongWidth = 32;
887-
this->PointerAlign = 32;
888-
this->PointerWidth = 32;
889-
this->IntMaxType = TargetInfo::SignedLongLong;
890-
this->Int64Type = TargetInfo::SignedLongLong;
891-
this->DoubleAlign = 64;
892-
this->LongDoubleWidth = 64;
893-
this->LongDoubleAlign = 64;
894-
this->LongLongWidth = 64;
895-
this->LongLongAlign = 64;
896-
this->SizeType = TargetInfo::UnsignedInt;
897-
this->PtrDiffType = TargetInfo::SignedInt;
898-
this->IntPtrType = TargetInfo::SignedInt;
899-
// RegParmMax is inherited from the underlying architecture.
900-
this->LongDoubleFormat = &llvm::APFloat::IEEEdouble();
901-
if (Triple.getArch() == llvm::Triple::arm) {
902-
// Handled in ARM's setABI().
903-
} else if (Triple.getArch() == llvm::Triple::x86) {
904-
this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-"
905-
"i64:64-i128:128-n8:16:32-S128");
906-
} else if (Triple.getArch() == llvm::Triple::x86_64) {
907-
this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-"
908-
"i64:64-i128:128-n8:16:32:64-S128");
909-
} else if (Triple.getArch() == llvm::Triple::mipsel) {
910-
// Handled on mips' setDataLayout.
911-
}
912-
}
913-
};
914-
915868
// Fuchsia Target
916869
template <typename Target>
917870
class LLVM_LIBRARY_VISIBILITY FuchsiaTargetInfo : public OSTargetInfo<Target> {

‎clang/lib/Basic/Targets/PNaCl.cpp‎

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

‎clang/lib/Basic/Targets/PNaCl.h‎

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

‎clang/lib/CodeGen/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ add_clang_library(clangCodeGen
144144
Targets/MSP430.cpp
145145
Targets/Mips.cpp
146146
Targets/NVPTX.cpp
147-
Targets/PNaCl.cpp
148147
Targets/PPC.cpp
149148
Targets/RISCV.cpp
150149
Targets/SPIR.cpp

‎clang/lib/CodeGen/CodeGenModule.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ createTargetCodeGenInfo(CodeGenModule &CGM) {
118118
return createM68kTargetCodeGenInfo(CGM);
119119
case llvm::Triple::mips:
120120
case llvm::Triple::mipsel:
121-
if (Triple.getOS() == llvm::Triple::NaCl)
122-
return createPNaClTargetCodeGenInfo(CGM);
123-
else if (Triple.getOS() == llvm::Triple::Win32)
121+
if (Triple.getOS() == llvm::Triple::Win32)
124122
return createWindowsMIPSTargetCodeGenInfo(CGM, /*IsOS32=*/true);
125123
return createMIPSTargetCodeGenInfo(CGM, /*IsOS32=*/true);
126124

0 commit comments

Comments
 (0)