diff options
| -rw-r--r-- | clang/include/clang/Driver/CC1Options.td | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/CC1Options.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 5 | ||||
| -rw-r--r-- | clang/test/CodeGen/vector.c | 2 | ||||
| -rw-r--r-- | clang/test/Sema/carbon.c | 2 | ||||
| -rw-r--r-- | clang/test/SemaObjC/cocoa.m | 2 | ||||
| -rw-r--r-- | clang/tools/clang-cc/Options.cpp | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/clang/include/clang/Driver/CC1Options.td b/clang/include/clang/Driver/CC1Options.td index 5b64199e021..e2042261ca3 100644 --- a/clang/include/clang/Driver/CC1Options.td +++ b/clang/include/clang/Driver/CC1Options.td @@ -19,7 +19,7 @@ include "OptParser.td" def target_abi : Separate<"-target-abi">, HelpText<"Target a particular ABI type">; def mcpu : Separate<"-mcpu">, - HelpText<"Target a specific cpu type (-mcpu=help for details)">; + HelpText<"Target a specific cpu type ('-mcpu help' for details)">; def target_feature : Separate<"-target-feature">, HelpText<"Target specific attributes">; def triple : Separate<"-triple">, diff --git a/clang/lib/Driver/CC1Options.cpp b/clang/lib/Driver/CC1Options.cpp index 7655770ccca..7b0d67a1d2d 100644 --- a/clang/lib/Driver/CC1Options.cpp +++ b/clang/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/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 994bffa475a..265987ea704 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/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=. diff --git a/clang/test/CodeGen/vector.c b/clang/test/CodeGen/vector.c index 2945ebaa4d0..21a03d0593d 100644 --- a/clang/test/CodeGen/vector.c +++ b/clang/test/CodeGen/vector.c @@ -1,4 +1,4 @@ -// RUN: clang-cc -triple i386-apple-darwin9 -mcpu=pentium4 -g -emit-llvm %s -o - +// RUN: clang-cc -triple i386-apple-darwin9 -mcpu pentium4 -g -emit-llvm %s -o - typedef short __v4hi __attribute__ ((__vector_size__ (8))); void test1() { diff --git a/clang/test/Sema/carbon.c b/clang/test/Sema/carbon.c index 5eda4385ac4..8292ba8a506 100644 --- a/clang/test/Sema/carbon.c +++ b/clang/test/Sema/carbon.c @@ -1,4 +1,4 @@ -// RUN: clang-cc -mcpu=pentium4 %s -print-stats +// RUN: clang-cc -mcpu pentium4 %s -print-stats #ifdef __APPLE__ #include <Carbon/Carbon.h> #endif diff --git a/clang/test/SemaObjC/cocoa.m b/clang/test/SemaObjC/cocoa.m index b73b3c4ccd3..7dab9f55e73 100644 --- a/clang/test/SemaObjC/cocoa.m +++ b/clang/test/SemaObjC/cocoa.m @@ -1,4 +1,4 @@ -// RUN: clang-cc -mcpu=pentium4 %s -print-stats +// RUN: clang-cc -mcpu pentium4 %s -print-stats #ifdef __APPLE__ #include <Cocoa/Cocoa.h> #endif diff --git a/clang/tools/clang-cc/Options.cpp b/clang/tools/clang-cc/Options.cpp index 7b40a667b3d..95c81a513f9 100644 --- a/clang/tools/clang-cc/Options.cpp +++ b/clang/tools/clang-cc/Options.cpp @@ -757,7 +757,7 @@ TargetABI("target-abi", static llvm::cl::opt<std::string> TargetCPU("mcpu", - llvm::cl::desc("Target a specific cpu type (-mcpu=help for details)")); + llvm::cl::desc("Target a specific cpu type ('-mcpu help' for details)")); static llvm::cl::list<std::string> TargetFeatures("target-feature", llvm::cl::desc("Target specific attributes")); |
