Revert "[IAS] Teach -cc1as about the 'target-abi' option."

This reverts commit 0e41c8faeff75614cf4627533331d780ba3db030.

This is breaking buildbots:
http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_check/4668/

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@231248 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td
index 19b56f72baf00debb96216514a2c7f26dc8e7345..f60fb4e4abca82bc9dc52e4e67b1ee9461d33ca8 100644 (file)
--- a/include/clang/Driver/CC1Options.td
+++ b/include/clang/Driver/CC1Options.td
@@ -25,11 +25,11 @@ def target_feature : Separate<["-"], "target-feature">,
   HelpText<"Target specific attributes">;
 def triple : Separate<["-"], "triple">,
   HelpText<"Specify target triple (e.g. i686-apple-darwin9)">;
-def target_abi : Separate<["-"], "target-abi">,
-  HelpText<"Target a particular ABI type">;
 
 }
 
+def target_abi : Separate<["-"], "target-abi">,
+  HelpText<"Target a particular ABI type">;
 def target_linker_version : Separate<["-"], "target-linker-version">,
   HelpText<"Target linker version">;
 def triple_EQ : Joined<["-"], "triple=">, Alias<triple>;

diff --git a/test/Driver/target-abi-cc1as.s b/test/Driver/target-abi-cc1as.s
deleted file mode 100644 (file)
index 86c9fc3..0000000
--- a/test/Driver/target-abi-cc1as.s
+++ /dev/null
@@ -1,5 +0,0 @@
-// Check if -cc1as knows about the 'target-abi' argument.
-
-// RUN: %clang -cc1as -triple mips--linux-gnu -filetype obj -target-cpu mips32 -target-abi o32 %s 2>&1 | \
-// RUN:   FileCheck --check-prefix=ABI-O32 %s
-// ABI-O32-NOT: clang -cc1as: error: unknown argument: '-target-abi'