From 82d942a1a064b7769b18540924df8496c1a4e6d4 Mon Sep 17 00:00:00 2001 From: Richard Barton Date: Mon, 11 May 2015 17:05:05 +0000 Subject: [PATCH] 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 --- include/clang/Driver/Options.td | 4 ++-- test/Driver/target.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index a78110e662..5a9af10afb 100644 --- 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; 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, Alias, // 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; -def target_legacy_spelling : Separate<["-", "--"], "target">, Alias; +def target_legacy_spelling : Separate<["-"], "target">, Alias; // 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 c7652ff62c..a46ba16296 100644 --- 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 -- 2.40.0