Index: clang/lib/Driver/Driver.cpp
===================================================================
--- clang/lib/Driver/Driver.cpp
+++ clang/lib/Driver/Driver.cpp
@@ -4952,7 +4952,8 @@
       // already been warned about.
       if (!IsCLMode() || !A->getOption().matches(options::OPT_UNKNOWN)) {
         if (A->getOption().hasFlag(options::TargetSpecific) &&
-            !A->isIgnoredTargetSpecific() && !HasAssembleJob) {
+            !A->isIgnoredTargetSpecific() && !HasAssembleJob &&
+            !C.getActions().empty()) {
           Diag(diag::err_drv_unsupported_opt_for_target)
               << A->getSpelling() << getTargetTriple();
         } else {
Index: clang/test/Driver/suppress-err-on-target-specific-options.c
===================================================================
--- /dev/null
+++ clang/test/Driver/suppress-err-on-target-specific-options.c
@@ -0,0 +1,26 @@
+// REQUIRES: x86-registered-target
+// REQUIRES: aarch64-registered-target
+
+// RUN: %clang --target=aarch64-none-gnu --verbose -mcpu= 2>&1 | FileCheck %s --check-prefix=WARNING
+// RUN: %clang --target=aarch64-none-gnu --verbose -march= 2>&1 | FileCheck %s --check-prefix=WARNING
+// RUN: %clang --target=aarch64-none-gnu -### -mcpu= 2>&1 | FileCheck %s --check-prefix=WARNING
+// RUN: %clang --target=aarch64-none-gnu -### -march= 2>&1 | FileCheck %s --check-prefix=WARNING
+
+// RUN: %clang --target=x86_64-unknown-linux-gnu --verbose -mcpu= 2>&1 | FileCheck %s --check-prefix=WARNING
+// RUN: %clang --target=x86_64-unknown-linux-gnu --verbose -march= 2>&1 | FileCheck %s --check-prefix=WARNING
+// RUN: %clang --target=x86_64-unknown-linux-gnu -### -mcpu= 2>&1 | FileCheck %s --check-prefix=WARNING
+// RUN: %clang --target=x86_64-unknown-linux-gnu -### -march= 2>&1 | FileCheck %s --check-prefix=WARNING
+
+// RUN: touch %t.c
+// RUN: not %clang --target=x86_64-unknown-linux-gnu --verbose -mcpu=corei7 %t.c -S 2>&1 | FileCheck %s --check-prefix=ERROR-X86
+// RUN: not %clang --target=x86_64-unknown-linux-gnu -### -mcpu=corei7 %t.c -S 2>&1 | FileCheck %s --check-prefix=ERROR-X86
+
+// RUN: %clang --target=aarch64-none-gnu --verbose -mcpu=neoverse-v1 %t.c -S 2>&1 | FileCheck %s --check-prefix=ERROR-AARCH64
+// RUN: %clang --target=aarch64-none-gnu -### -mcpu=neoverse-v1 %t.c 2>&1 -S | FileCheck %s --check-prefix=ERROR-AARCH64
+
+// In situation when there is no compilation/linking clang should not emit error
+// about target specific options, but just warn that are not used.
+WARNING: warning: argument unused during compilation
+
+ERROR-X86: error: unsupported option {{.*}} for target 'x86_64-unknown-linux-gnu'
+ERROR-AARCH64-NOT: error: unsupported option {{.*}} for target 'aarch64-none-gnu'