Skip to content

Commit 9a1faea

Browse files
brad0brad0
committed
Remove Native Client support
1 parent d9ccfd7 commit 9a1faea

File tree

99 files changed

+51
-2558
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
-2558
lines changed

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

-4
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,6 @@ class TargetInfo : public TransferrableTargetInfo,
336336
/// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055a/IHI0055A_aapcs64.pdf
337337
AArch64ABIBuiltinVaList,
338338

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

‎clang/lib/AST/ASTContext.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -9760,14 +9760,6 @@ CreateX86_64ABIBuiltinVaListDecl(const ASTContext *Context) {
97609760
return Context->buildImplicitTypedef(VaListTagArrayType, "__builtin_va_list");
97619761
}
97629762

9763-
static TypedefDecl *CreatePNaClABIBuiltinVaListDecl(const ASTContext *Context) {
9764-
// typedef int __builtin_va_list[4];
9765-
llvm::APInt Size(Context->getTypeSize(Context->getSizeType()), 4);
9766-
QualType IntArrayType = Context->getConstantArrayType(
9767-
Context->IntTy, Size, nullptr, ArraySizeModifier::Normal, 0);
9768-
return Context->buildImplicitTypedef(IntArrayType, "__builtin_va_list");
9769-
}
9770-
97719763
static TypedefDecl *
97729764
CreateAAPCSABIBuiltinVaListDecl(const ASTContext *Context) {
97739765
// struct __va_list
@@ -9965,8 +9957,6 @@ static TypedefDecl *CreateVaListDecl(const ASTContext *Context,
99659957
return CreatePowerABIBuiltinVaListDecl(Context);
99669958
case TargetInfo::X86_64ABIBuiltinVaList:
99679959
return CreateX86_64ABIBuiltinVaListDecl(Context);
9968-
case TargetInfo::PNaClABIBuiltinVaList:
9969-
return CreatePNaClABIBuiltinVaListDecl(Context);
99709960
case TargetInfo::AAPCSABIBuiltinVaList:
99719961
return CreateAAPCSABIBuiltinVaListDecl(Context);
99729962
case TargetInfo::SystemZBuiltinVaList:

‎clang/lib/Basic/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ add_clang_library(clangBasic
109109
Targets/Mips.cpp
110110
Targets/NVPTX.cpp
111111
Targets/OSTargets.cpp
112-
Targets/PNaCl.cpp
113112
Targets/PPC.cpp
114113
Targets/RISCV.cpp
115114
Targets/SPIR.cpp

‎clang/lib/Basic/Targets.cpp

-12
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"
@@ -225,8 +224,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
225224
return std::make_unique<RTEMSTargetInfo<ARMleTargetInfo>>(Triple, Opts);
226225
case llvm::Triple::Haiku:
227226
return std::make_unique<HaikuTargetInfo<ARMleTargetInfo>>(Triple, Opts);
228-
case llvm::Triple::NaCl:
229-
return std::make_unique<NaClTargetInfo<ARMleTargetInfo>>(Triple, Opts);
230227
case llvm::Triple::Win32:
231228
switch (Triple.getEnvironment()) {
232229
case llvm::Triple::Cygnus:
@@ -257,8 +254,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
257254
return std::make_unique<NetBSDTargetInfo<ARMbeTargetInfo>>(Triple, Opts);
258255
case llvm::Triple::RTEMS:
259256
return std::make_unique<RTEMSTargetInfo<ARMbeTargetInfo>>(Triple, Opts);
260-
case llvm::Triple::NaCl:
261-
return std::make_unique<NaClTargetInfo<ARMbeTargetInfo>>(Triple, Opts);
262257
default:
263258
return std::make_unique<ARMbeTargetInfo>(Triple, Opts);
264259
}
@@ -301,9 +296,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
301296
return std::make_unique<FreeBSDTargetInfo<MipsTargetInfo>>(Triple, Opts);
302297
case llvm::Triple::NetBSD:
303298
return std::make_unique<NetBSDTargetInfo<MipsTargetInfo>>(Triple, Opts);
304-
case llvm::Triple::NaCl:
305-
return std::make_unique<NaClTargetInfo<NaClMips32TargetInfo>>(Triple,
306-
Opts);
307299
case llvm::Triple::Win32:
308300
switch (Triple.getEnvironment()) {
309301
case llvm::Triple::GNU:
@@ -585,8 +577,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
585577
return std::make_unique<HaikuX86_32TargetInfo>(Triple, Opts);
586578
case llvm::Triple::RTEMS:
587579
return std::make_unique<RTEMSX86_32TargetInfo>(Triple, Opts);
588-
case llvm::Triple::NaCl:
589-
return std::make_unique<NaClTargetInfo<X86_32TargetInfo>>(Triple, Opts);
590580
case llvm::Triple::ELFIAMCU:
591581
return std::make_unique<MCUX86_32TargetInfo>(Triple, Opts);
592582
case llvm::Triple::Hurd:
@@ -646,8 +636,6 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
646636
}
647637
case llvm::Triple::Haiku:
648638
return std::make_unique<HaikuTargetInfo<X86_64TargetInfo>>(Triple, Opts);
649-
case llvm::Triple::NaCl:
650-
return std::make_unique<NaClTargetInfo<X86_64TargetInfo>>(Triple, Opts);
651639
case llvm::Triple::PS4:
652640
return std::make_unique<PS4OSTargetInfo<X86_64TargetInfo>>(Triple, Opts);
653641
case llvm::Triple::PS5:

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

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

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

-47
Original file line numberDiff line numberDiff line change
@@ -842,53 +842,6 @@ class LLVM_LIBRARY_VISIBILITY WindowsTargetInfo : public OSTargetInfo<Target> {
842842
}
843843
};
844844

845-
template <typename Target>
846-
class LLVM_LIBRARY_VISIBILITY NaClTargetInfo : public OSTargetInfo<Target> {
847-
protected:
848-
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
849-
MacroBuilder &Builder) const override {
850-
if (Opts.POSIXThreads)
851-
Builder.defineMacro("_REENTRANT");
852-
if (Opts.CPlusPlus)
853-
Builder.defineMacro("_GNU_SOURCE");
854-
855-
DefineStd(Builder, "unix", Opts);
856-
Builder.defineMacro("__native_client__");
857-
}
858-
859-
public:
860-
NaClTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
861-
: OSTargetInfo<Target>(Triple, Opts) {
862-
this->LongAlign = 32;
863-
this->LongWidth = 32;
864-
this->PointerAlign = 32;
865-
this->PointerWidth = 32;
866-
this->IntMaxType = TargetInfo::SignedLongLong;
867-
this->Int64Type = TargetInfo::SignedLongLong;
868-
this->DoubleAlign = 64;
869-
this->LongDoubleWidth = 64;
870-
this->LongDoubleAlign = 64;
871-
this->LongLongWidth = 64;
872-
this->LongLongAlign = 64;
873-
this->SizeType = TargetInfo::UnsignedInt;
874-
this->PtrDiffType = TargetInfo::SignedInt;
875-
this->IntPtrType = TargetInfo::SignedInt;
876-
// RegParmMax is inherited from the underlying architecture.
877-
this->LongDoubleFormat = &llvm::APFloat::IEEEdouble();
878-
if (Triple.getArch() == llvm::Triple::arm) {
879-
// Handled in ARM's setABI().
880-
} else if (Triple.getArch() == llvm::Triple::x86) {
881-
this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-"
882-
"i64:64-i128:128-n8:16:32-S128");
883-
} else if (Triple.getArch() == llvm::Triple::x86_64) {
884-
this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-"
885-
"i64:64-i128:128-n8:16:32:64-S128");
886-
} else if (Triple.getArch() == llvm::Triple::mipsel) {
887-
// Handled on mips' setDataLayout.
888-
}
889-
}
890-
};
891-
892845
// Fuchsia Target
893846
template <typename Target>
894847
class LLVM_LIBRARY_VISIBILITY FuchsiaTargetInfo : public OSTargetInfo<Target> {

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

-29
This file was deleted.

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

-90
This file was deleted.

‎clang/lib/CodeGen/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ add_clang_library(clangCodeGen
142142
Targets/MSP430.cpp
143143
Targets/Mips.cpp
144144
Targets/NVPTX.cpp
145-
Targets/PNaCl.cpp
146145
Targets/PPC.cpp
147146
Targets/RISCV.cpp
148147
Targets/SPIR.cpp

‎clang/lib/CodeGen/CodeGenModule.cpp

+1-3
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

‎clang/lib/CodeGen/TargetInfo.h

-3
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,6 @@ createMSP430TargetCodeGenInfo(CodeGenModule &CGM);
533533
std::unique_ptr<TargetCodeGenInfo>
534534
createNVPTXTargetCodeGenInfo(CodeGenModule &CGM);
535535

536-
std::unique_ptr<TargetCodeGenInfo>
537-
createPNaClTargetCodeGenInfo(CodeGenModule &CGM);
538-
539536
enum class PPC64_SVR4_ABIKind {
540537
ELFv1 = 0,
541538
ELFv2,

0 commit comments

Comments
 (0)