From d0cf6c852a8da772af89ae129a40d600e49f1bc2 Mon Sep 17 00:00:00 2001 From: Michael Zolotukhin Date: Tue, 17 Mar 2015 22:13:05 +0000 Subject: [PATCH] Imply linker arguments from '-fveclib' option. Summary: As discussed in D8097, we should provide corresponding linking flags when 'fveclib' is specified. Reviewers: hfinkel Differential Revision: http://reviews.llvm.org/D8362 llvm-svn: 232556 --- clang/lib/Driver/Tools.cpp | 10 ++++++++++ clang/test/Driver/fveclib.c | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 3650a94b92bc..681a9a388503 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -6138,6 +6138,16 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(std::string("-F") + (*it)->getValue())); + if (!Args.hasArg(options::OPT_nostdlib) && + !Args.hasArg(options::OPT_nodefaultlibs)) { + if (Arg *A = Args.getLastArg(options::OPT_fveclib)) { + if (A->getValue() == StringRef("Accelerate")) { + CmdArgs.push_back("-framework"); + CmdArgs.push_back("Accelerate"); + } + } + } + const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath()); std::unique_ptr Cmd = diff --git a/clang/test/Driver/fveclib.c b/clang/test/Driver/fveclib.c index 4515dd77316f..3bd4bf630f0a 100644 --- a/clang/test/Driver/fveclib.c +++ b/clang/test/Driver/fveclib.c @@ -6,3 +6,12 @@ // CHECK-ACCELERATE: "-fveclib=Accelerate" // CHECK-INVALID: error: invalid value 'something' in '-fveclib=something' + +// RUN: %clang -fveclib=Accelerate %s -target arm64-apple-ios8.0.0 -### 2>&1 | FileCheck --check-prefix=CHECK-LINK %s +// CHECK-LINK: "-framework" "Accelerate" + +// RUN: %clang -fveclib=Accelerate %s -nostdlib -target arm64-apple-ios8.0.0 -### 2>&1 | FileCheck --check-prefix=CHECK-LINK-NOSTDLIB %s +// CHECK-LINK-NOSTDLIB-NOT: "-framework" "Accelerate" + +// RUN: %clang -fveclib=Accelerate %s -nodefaultlibs -target arm64-apple-ios8.0.0 -### 2>&1 | FileCheck --check-prefix=CHECK-LINK-NODEFAULTLIBS %s +// CHECK-LINK-NODEFAULTLIBS-NOT: "-framework" "Accelerate"