From 872f04d19d3d6efdd2b2d51493aba0215b712c6c Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Mon, 4 Mar 2013 22:37:43 +0000 Subject: [PATCH] Fix confused use of llvm::StringSwitch for armv7r architecture. svn 170909 added support for cortex-r5 but in this case it was done incorrectly. The last argument to StringSwitch.Cases() is the replacement value, so by adding "cortex-r5" it changed the default cpu for armv7r to cortex-r5 instead of cortex-r4. llvm-svn: 176456 --- clang/lib/Driver/ToolChain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 751c9f8..a7311d7 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -113,7 +113,7 @@ static const char *getARMTargetCPU(const ArgList &Args, .Cases("armv7l", "armv7-l", "cortex-a8") .Cases("armv7f", "armv7-f", "cortex-a9-mp") .Cases("armv7s", "armv7-s", "swift") - .Cases("armv7r", "armv7-r", "cortex-r4", "cortex-r5") + .Cases("armv7r", "armv7-r", "cortex-r4") .Cases("armv7m", "armv7-m", "cortex-m3") .Case("ep9312", "ep9312") .Case("iwmmxt", "iwmmxt") -- 2.7.4