From 5db37f3bca3d404b0d7fcbe1dc764ee67665e6c2 Mon Sep 17 00:00:00 2001 From: Douglas Yung Date: Thu, 26 Mar 2020 15:45:40 -0700 Subject: [PATCH] Make PS4 use -fno-use-init-array only as the ABI does not support .init_array. Reviewed by Paul Robinson --- clang/lib/Driver/ToolChains/PS4CPU.cpp | 12 ++++++++++++ clang/lib/Driver/ToolChains/PS4CPU.h | 5 +++++ clang/test/Driver/ps4cpu.c | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 clang/test/Driver/ps4cpu.c diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp b/clang/lib/Driver/ToolChains/PS4CPU.cpp index 9ecbb72..2c0d8d0 100644 --- a/clang/lib/Driver/ToolChains/PS4CPU.cpp +++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp @@ -434,3 +434,15 @@ SanitizerMask toolchains::PS4CPU::getSupportedSanitizers() const { Res |= SanitizerKind::Vptr; return Res; } + +void toolchains::PS4CPU::addClangTargetOptions( + const ArgList &DriverArgs, + ArgStringList &CC1Args, + Action::OffloadKind DeviceOffloadingKind) const { + // PS4 does not use init arrays. + if (DriverArgs.hasArg(clang::driver::options::OPT_fuse_init_array)) + getDriver().Diag(clang::diag::err_drv_unsupported_opt_for_target) + << "-fuse-init-array" << getTriple().str(); + + CC1Args.push_back("-fno-use-init-array"); +} diff --git a/clang/lib/Driver/ToolChains/PS4CPU.h b/clang/lib/Driver/ToolChains/PS4CPU.h index c82b0c3..8fedb6e 100644 --- a/clang/lib/Driver/ToolChains/PS4CPU.h +++ b/clang/lib/Driver/ToolChains/PS4CPU.h @@ -88,6 +88,11 @@ public: // capable of unit splitting. bool canSplitThinLTOUnit() const override { return false; } + void addClangTargetOptions( + const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args, + Action::OffloadKind DeviceOffloadingKind) const override; + llvm::DenormalMode getDefaultDenormalModeForType( const llvm::opt::ArgList &DriverArgs, Action::OffloadKind DeviceOffloadKind, diff --git a/clang/test/Driver/ps4cpu.c b/clang/test/Driver/ps4cpu.c new file mode 100644 index 0000000..ac5f3fc --- /dev/null +++ b/clang/test/Driver/ps4cpu.c @@ -0,0 +1,17 @@ +// REQUIRES: x86-registered-target + +// Test that the driver always emits -fno-use-init-array on the PS4 target +// since its ABI does not support the .init_array section. + +// RUN: %clang -c %s -target x86_64-scei-ps4 -### 2>&1 \ +// RUN: | FileCheck %s +// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-use-init-array -### 2>&1 \ +// RUN: | FileCheck %s +// RUN: %clang -c %s -target x86_64-scei-ps4 -fuse-init-array -### 2>&1 \ +// RUN: | FileCheck %s --check-prefix=CHECK-ERROR + +// CHECK: "-fno-use-init-array" +// CHECK-NOT: "-fuse-init-array" + +// CHECK-ERROR: unsupported option '-fuse-init-array' for target 'x86_64-scei-ps4' + -- 2.7.4