Revert "Allow -target= and --target options"

After mailing list discussion on 11-13 March we would prefer to stick to a
single spelling of the long option.

This reverts commit 30035fe1a7c759c89ee62eb46efce6b3790fcc08.

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

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index a78110e662680af88f4b904d34f6dbe204fa3d69..5a9af10afbc92b532513fe19d487c23d33ce0897 100644 (file)
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -1581,7 +1581,7 @@ def no_system_header_prefix : Joined<["--"], "no-system-header-prefix=">,
            "system header.">;
 def : Separate<["--"], "no-system-header-prefix">, Alias<no_system_header_prefix>;
 def s : Flag<["-"], "s">;
-def target : Joined<["-", "--"], "target=">, Flags<[DriverOption, CoreOption]>,
+def target : Joined<["--"], "target=">, Flags<[DriverOption, CoreOption]>,
   HelpText<"Generate code for the given target">;
 def gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[DriverOption]>,
   HelpText<"Use the gcc toolchain at the given directory">;
@@ -1754,7 +1754,7 @@ def mv5 : Flag<["-"], "mv5">, Group<m_hexagon_Features_Group>, Alias<march_EQ>,
 // aliases for options that are spelled using the more common Unix / GNU flag
 // style of double-dash and equals-joined flags.
 def gcc_toolchain_legacy_spelling : Separate<["-"], "gcc-toolchain">, Alias<gcc_toolchain>;
-def target_legacy_spelling : Separate<["-", "--"], "target">, Alias<target>;
+def target_legacy_spelling : Separate<["-"], "target">, Alias<target>;
 
 // Special internal option to handle -Xlinker --no-demangle.
 def Z_Xlinker__no_demangle : Flag<["-"], "Z-Xlinker-no-demangle">,

diff --git a/test/Driver/target.c b/test/Driver/target.c
index c7652ff62c9f9d1fa855fac089c26f8b4ed12b4c..a46ba16296a706aca8722b30980190f61a331b90 100644 (file)
--- a/test/Driver/target.c
+++ b/test/Driver/target.c
@@ -7,9 +7,3 @@
 // Also check that the legacy spelling works.
 // RUN: %clang -no-canonical-prefixes -target unknown-unknown-unknown -c %s \
 // RUN:   -o %t.o -### 2>&1 | FileCheck %s
-//
-// RUN: %clang -no-canonical-prefixes -target=unknown-unknown-unknown -c %s \
-// RUN:   -o %t.o -### 2>&1 | FileCheck %s
-//
-// RUN: %clang -no-canonical-prefixes --target unknown-unknown-unknown -c %s \
-// RUN:   -o %t.o -### 2>&1 | FileCheck %s