From 89478148d836b0b774355e33d9f0618cf4461795 Mon Sep 17 00:00:00 2001 From: Jian Cai Date: Mon, 14 Oct 2019 22:28:01 +0000 Subject: [PATCH] Revert "Add support to -Wa,-W in clang" This reverts commit e72eeca43b9577be2aae55f7603febbf223a6ab3. llvm-svn: 374833 --- clang/lib/Driver/ToolChains/Clang.cpp | 2 +- clang/test/Driver/as-w-option.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 clang/test/Driver/as-w-option.c diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index dfb3f33..52fe20c 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -2140,7 +2140,7 @@ static void CollectArgsForIntegratedAssembler(Compilation &C, CmdArgs.push_back("-msave-temp-labels"); } else if (Value == "--fatal-warnings") { CmdArgs.push_back("-massembler-fatal-warnings"); - } else if (Value == "--no-warn" || Value == "-W") { + } else if (Value == "--no-warn") { CmdArgs.push_back("-massembler-no-warn"); } else if (Value == "--noexecstack") { UseNoExecStack = true; diff --git a/clang/test/Driver/as-w-option.c b/clang/test/Driver/as-w-option.c deleted file mode 100644 index afaf1cf..0000000 --- a/clang/test/Driver/as-w-option.c +++ /dev/null @@ -1,14 +0,0 @@ -// RUN: %clang -### %s -c -o tmp.o -fno-integrated-as -Wa,-W 2>&1 | FileCheck -check-prefix=CHECK-NOIAS %s -// RUN: %clang -### %s -c -o tmp.o -integrated-as -Wa,-W 2>&1 | FileCheck -check-prefix=CHECK-IAS %s -// RUN: %clang %s -c -o %t.o -integrated-as -Wa,-W 2>&1 | FileCheck -allow-empty --check-prefix=CHECK-AS-NOWARN %s -// RUN: %clang %s -c -o %t.o -fno-integrated-as -Wa,-W 2>&1 | FileCheck -allow-empty --check-prefix=CHECK-AS-NOWARN %s -// RUN: not %clang %s -c -o %t.o -integrated-as -Wa,--fatal-warnings 2>&1 | FileCheck --check-prefix=CHECK-AS-FATAL %s -// RUN: not %clang %s -c -o %t.o -fno-integrated-as -Wa,--fatal-warnings 2>&1 | FileCheck --check-prefix=CHECK-AS-FATAL %s - -// CHECK-IAS: "-cc1" {{.*}} "-massembler-no-warn" -// CHECK-NOIAS: "-W" -// CHECK-AS-NOWARN-NOT: warning: -// CHECK-AS-FATAL-NOT: warning: -// CHECK-AS-FATAL: error - -__asm(".warning"); -- 2.7.4