From e3595c5ee135331dc89f3a8dce00956122fc028e Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Mon, 9 May 2016 19:09:59 +0000 Subject: [PATCH] [Myriad] Use Generic_ELF::addClangTargetOptions() git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@268956 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 2 +- lib/Driver/ToolChains.h | 2 +- test/Driver/myriad-toolchain.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 14b5381f08..b114ede653 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -4401,7 +4401,7 @@ void XCoreToolChain::AddCXXStdlibLibArgs(const ArgList &Args, MyriadToolChain::MyriadToolChain(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - : Generic_GCC(D, Triple, Args) { + : Generic_ELF(D, Triple, Args) { // If a target of 'sparc-myriad-elf' is specified to clang, it wants to use // 'sparc-myriad--elf' (note the unknown OS) as the canonical triple. // This won't work to find gcc. Instead we give the installation detector an diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index 9a08d8e7d5..307b2e95d1 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -1093,7 +1093,7 @@ public: /// MyriadToolChain - A tool chain using either clang or the external compiler /// installed by the Movidius SDK to perform all subcommands. -class LLVM_LIBRARY_VISIBILITY MyriadToolChain : public Generic_GCC { +class LLVM_LIBRARY_VISIBILITY MyriadToolChain : public Generic_ELF { public: MyriadToolChain(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args); diff --git a/test/Driver/myriad-toolchain.c b/test/Driver/myriad-toolchain.c index 28dd4252a1..3e580ac77e 100644 --- a/test/Driver/myriad-toolchain.c +++ b/test/Driver/myriad-toolchain.c @@ -77,3 +77,7 @@ // RUN: %clang -### -c -g %s -target sparc-myriad 2>&1 | FileCheck -check-prefix=G_SPARC %s // G_SPARC: "-debug-info-kind=limited" "-dwarf-version=2" + +// RUN: %clang -### -c %s -target sparc-myriad-elf -fuse-init-array 2>&1 \ +// RUN: | FileCheck -check-prefix=USE-INIT-ARRAY %s +// USE-INIT-ARRAY-NOT: argument unused -- 2.40.0