[llvm-branch-commits] [cfe-branch] r118047 - /cfe/branches/Apple/whitney/lib/Driver/Tools.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  2 15:32:34 2010
New Revision: 118047

URL: http://llvm.org/viewvc/llvm-project?rev=118047&view=rev
Log:
Merge r118037:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Tue Nov 2 19:42:04 2010 +0000

    Driver: Silently ignore -fasm-blocks for now instead of error'ing, this cause
    some unexpected fallout.

Modified:
    cfe/branches/Apple/whitney/lib/Driver/Tools.cpp

Modified: cfe/branches/Apple/whitney/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Driver/Tools.cpp?rev=118047&r1=118046&r2=118047&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Driver/Tools.cpp Tue Nov  2 15:32:34 2010
@@ -1496,16 +1496,9 @@
     CmdArgs.push_back("-fno-spell-checking");
 
 
-  // -fasm-blocks is disallowed except on X86, where we just ignore it.
-  if (Args.hasFlag(options::OPT_fasm_blocks, options::OPT_fno_asm_blocks,
-                   false)) {
-    if (getToolChain().getTriple().getArch() != llvm::Triple::x86 &&
-        getToolChain().getTriple().getArch() != llvm::Triple::x86_64)
-      D.Diag(clang::diag::err_drv_clang_unsupported_per_platform)
-        << "-fasm-blocks";
-  }
-
-  // -fasm-blocks is disallowed except on X86, where we just ignore it.
+  // Silently ignore -fasm-blocks for now.
+  (void) Args.hasFlag(options::OPT_fasm_blocks, options::OPT_fno_asm_blocks,
+                      false);
 
   if (Arg *A = Args.getLastArg(options::OPT_fshow_overloads_EQ))
     A->render(Args, CmdArgs);