dougk created this revision. dougk added a reviewer: jyknight. dougk added a subscriber: cfe-commits.
http://reviews.llvm.org/D18186 Files: lib/Driver/Tools.cpp test/Driver/myriad-toolchain.c Index: test/Driver/myriad-toolchain.c =================================================================== --- test/Driver/myriad-toolchain.c +++ test/Driver/myriad-toolchain.c @@ -38,7 +38,7 @@ // RUN: %clang -target shave-myriad -c -### %s -isystem somewhere -Icommon -Wa,-yippee 2>&1 \ // RUN: | FileCheck %s -check-prefix=MOVICOMPILE -// MOVICOMPILE: moviCompile{{(.exe)?}}" "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-isystem" "somewhere" "-I" "common" +// MOVICOMPILE: moviCompile{{(.exe)?}}" "-S" "-fno-exceptions" "-DMYRIAD2" "-isystem" "somewhere" "-I" "common" // MOVICOMPILE: moviAsm{{(.exe)?}}" "-no6thSlotCompression" "-cv:myriad2" "-noSPrefixing" "-a" // MOVICOMPILE: "-yippee" "-i:somewhere" "-i:common" "-elf" @@ -58,15 +58,15 @@ // RUN: %clang -target shave-myriad -c %s -o foo.o -### -MD -MF dep.d 2>&1 \ // RUN: | FileCheck %s -check-prefix=MDMF -// MDMF: "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-MD" "-MF" "dep.d" "-MT" "foo.o" +// MDMF: "-S" "-fno-exceptions" "-DMYRIAD2" "-MD" "-MF" "dep.d" "-MT" "foo.o" -// RUN: %clang -target shave-myriad -std=gnu++11 -S %s -o foo.o -### 2>&1 \ +// RUN: %clang -target shave-myriad -std=gnu++11 -mcpu=acpu -S %s -o foo.o -### 2>&1 \ // RUN: | FileCheck %s -check-prefix=STDEQ -// STDEQ: "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-std=gnu++11" +// STDEQ: "-S" "-fno-exceptions" "-DMYRIAD2" "-std=gnu++11" "-mcpu=acpu" // RUN: %clang -target shave-myriad -E -Ifoo %s -o foo.i -### 2>&1 \ // RUN: | FileCheck %s -check-prefix=PREPROCESS -// PREPROCESS: "-E" "-mcpu=myriad2" "-DMYRIAD2" "-I" "foo" +// PREPROCESS: "-E" "-DMYRIAD2" "-I" "foo" // RUN: %clang -target sparc-myriad -### --driver-mode=g++ %s 2>&1 | FileCheck %s --check-prefix=STDLIBCXX // STDLIBCXX: "-lstdc++" "-lc" "-lgcc" Index: lib/Driver/Tools.cpp =================================================================== --- lib/Driver/Tools.cpp +++ lib/Driver/Tools.cpp @@ -10431,7 +10431,6 @@ CmdArgs.push_back("-S"); CmdArgs.push_back("-fno-exceptions"); // Always do this even if unspecified. } - CmdArgs.push_back("-mcpu=myriad2"); CmdArgs.push_back("-DMYRIAD2"); // Append all -I, -iquote, -isystem paths, defines/undefines, @@ -10441,7 +10440,8 @@ options::OPT_std_EQ, options::OPT_D, options::OPT_U, options::OPT_f_Group, options::OPT_f_clang_Group, options::OPT_g_Group, options::OPT_M_Group, - options::OPT_O_Group, options::OPT_W_Group}); + options::OPT_O_Group, options::OPT_W_Group, + options::OPT_mcpu_EQ}); // If we're producing a dependency file, and assembly is the final action, // then the name of the target in the dependency file should be the '.o'
Index: test/Driver/myriad-toolchain.c =================================================================== --- test/Driver/myriad-toolchain.c +++ test/Driver/myriad-toolchain.c @@ -38,7 +38,7 @@ // RUN: %clang -target shave-myriad -c -### %s -isystem somewhere -Icommon -Wa,-yippee 2>&1 \ // RUN: | FileCheck %s -check-prefix=MOVICOMPILE -// MOVICOMPILE: moviCompile{{(.exe)?}}" "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-isystem" "somewhere" "-I" "common" +// MOVICOMPILE: moviCompile{{(.exe)?}}" "-S" "-fno-exceptions" "-DMYRIAD2" "-isystem" "somewhere" "-I" "common" // MOVICOMPILE: moviAsm{{(.exe)?}}" "-no6thSlotCompression" "-cv:myriad2" "-noSPrefixing" "-a" // MOVICOMPILE: "-yippee" "-i:somewhere" "-i:common" "-elf" @@ -58,15 +58,15 @@ // RUN: %clang -target shave-myriad -c %s -o foo.o -### -MD -MF dep.d 2>&1 \ // RUN: | FileCheck %s -check-prefix=MDMF -// MDMF: "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-MD" "-MF" "dep.d" "-MT" "foo.o" +// MDMF: "-S" "-fno-exceptions" "-DMYRIAD2" "-MD" "-MF" "dep.d" "-MT" "foo.o" -// RUN: %clang -target shave-myriad -std=gnu++11 -S %s -o foo.o -### 2>&1 \ +// RUN: %clang -target shave-myriad -std=gnu++11 -mcpu=acpu -S %s -o foo.o -### 2>&1 \ // RUN: | FileCheck %s -check-prefix=STDEQ -// STDEQ: "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-std=gnu++11" +// STDEQ: "-S" "-fno-exceptions" "-DMYRIAD2" "-std=gnu++11" "-mcpu=acpu" // RUN: %clang -target shave-myriad -E -Ifoo %s -o foo.i -### 2>&1 \ // RUN: | FileCheck %s -check-prefix=PREPROCESS -// PREPROCESS: "-E" "-mcpu=myriad2" "-DMYRIAD2" "-I" "foo" +// PREPROCESS: "-E" "-DMYRIAD2" "-I" "foo" // RUN: %clang -target sparc-myriad -### --driver-mode=g++ %s 2>&1 | FileCheck %s --check-prefix=STDLIBCXX // STDLIBCXX: "-lstdc++" "-lc" "-lgcc" Index: lib/Driver/Tools.cpp =================================================================== --- lib/Driver/Tools.cpp +++ lib/Driver/Tools.cpp @@ -10431,7 +10431,6 @@ CmdArgs.push_back("-S"); CmdArgs.push_back("-fno-exceptions"); // Always do this even if unspecified. } - CmdArgs.push_back("-mcpu=myriad2"); CmdArgs.push_back("-DMYRIAD2"); // Append all -I, -iquote, -isystem paths, defines/undefines, @@ -10441,7 +10440,8 @@ options::OPT_std_EQ, options::OPT_D, options::OPT_U, options::OPT_f_Group, options::OPT_f_clang_Group, options::OPT_g_Group, options::OPT_M_Group, - options::OPT_O_Group, options::OPT_W_Group}); + options::OPT_O_Group, options::OPT_W_Group, + options::OPT_mcpu_EQ}); // If we're producing a dependency file, and assembly is the final action, // then the name of the target in the dependency file should be the '.o'
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits