r176456 - Fix confused use of llvm::StringSwitch for armv7r architecture.

Bob Wilson bob.wilson at apple.com
Mon Mar 4 14:37:44 PST 2013


Author: bwilson
Date: Mon Mar  4 16:37:43 2013
New Revision: 176456

URL: http://llvm.org/viewvc/llvm-project?rev=176456&view=rev
Log:
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.

Modified:
    cfe/trunk/lib/Driver/ToolChain.cpp

Modified: cfe/trunk/lib/Driver/ToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=176456&r1=176455&r2=176456&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChain.cpp Mon Mar  4 16:37:43 2013
@@ -113,7 +113,7 @@ static const char *getARMTargetCPU(const
     .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")





More information about the cfe-commits mailing list