Index: tools/clang/lib/Driver/Tools.cpp
===================================================================
--- tools/clang/lib/Driver/Tools.cpp	(revision 131958)
+++ tools/clang/lib/Driver/Tools.cpp	(working copy)
@@ -777,7 +777,8 @@ void Clang::AddX86TargetArgs(const ArgList &Args,
       else if (getToolChain().getArchName() == "i386")
         CPUName = "i486";
     } else if (getToolChain().getOS().startswith("freebsd"))  {
-      if (getToolChain().getArchName() == "x86_64")
+      if (getToolChain().getArchName() == "amd64" ||
+          getToolChain().getArchName() == "x86_64")
         CPUName = "x86-64";
       else if (getToolChain().getArchName() == "i386")
         CPUName = "i486";
