diff options
Diffstat (limited to 'lib/Driver')
| -rw-r--r-- | lib/Driver/CC1Options.cpp | 2 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Driver/CC1Options.cpp b/lib/Driver/CC1Options.cpp index 7655770ccc..7b0d67a1d2 100644 --- a/lib/Driver/CC1Options.cpp +++ b/lib/Driver/CC1Options.cpp @@ -136,7 +136,7 @@ static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args) { void CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, const llvm::SmallVectorImpl<llvm::StringRef> &Args) { - // This is gratuitous, but until we switch the driver to using StringRe we + // This is gratuitous, but until we switch the driver to using StringRef we // need to get C strings. llvm::SmallVector<std::string, 16> StringArgs(Args.begin(), Args.end()); llvm::SmallVector<const char *, 16> CStringArgs; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 994bffa475..265987ea70 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -209,7 +209,7 @@ void Clang::AddPreprocessingOptions(const Driver &D, /// getARMTargetCPU - Get the (LLVM) name of the ARM cpu we are targetting. // // FIXME: tblgen this. -static llvm::StringRef getARMTargetCPU(const ArgList &Args) { +static const char *getARMTargetCPU(const ArgList &Args) { // FIXME: Warn on inconsistent use of -mcpu and -march. // If we have -mcpu=, use that. @@ -370,7 +370,8 @@ void Clang::AddARMTargetArgs(const ArgList &Args, CmdArgs.push_back(ABIName); // Set the CPU based on -march= and -mcpu=. - CmdArgs.push_back(Args.MakeArgString("-mcpu=" + getARMTargetCPU(Args))); + CmdArgs.push_back("-mcpu"); + CmdArgs.push_back(getARMTargetCPU(Args)); // Select the float ABI as determined by -msoft-float, -mhard-float, and // -mfloat-abi=. |