[clang] 63544af - [Driver][test] Clean up hexagon-*
Fangrui Song via cfe-commits
cfe-commits at lists.llvm.org
Wed Sep 27 15:24:49 PDT 2023
Author: Fangrui Song
Date: 2023-09-27T15:24:44-07:00
New Revision: 63544af9e4197650b725dcc80152a8c2cde1cdbd
URL: https://github.com/llvm/llvm-project/commit/63544af9e4197650b725dcc80152a8c2cde1cdbd
DIFF: https://github.com/llvm/llvm-project/commit/63544af9e4197650b725dcc80152a8c2cde1cdbd.diff
LOG: [Driver][test] Clean up hexagon-*
Added:
Modified:
clang/test/Driver/hexagon-hvx-ieee-fp.c
clang/test/Driver/hexagon-hvx-qfloat.c
clang/test/Driver/hexagon-hvx.c
clang/test/Driver/hexagon-long-calls.c
clang/test/Driver/hexagon-memops.c
clang/test/Driver/hexagon-nvj.c
clang/test/Driver/hexagon-nvs.c
clang/test/Driver/hexagon-packets.c
clang/test/Driver/hexagon-toolchain-elf.c
clang/test/Driver/hexagon-toolchain-linux.c
clang/test/Driver/hexagon-vectorize.c
Removed:
clang/test/Driver/Inputs/hexagon_tree/Tools/bin/readme
################################################################################
diff --git a/clang/test/Driver/Inputs/hexagon_tree/Tools/bin/readme b/clang/test/Driver/Inputs/hexagon_tree/Tools/bin/readme
deleted file mode 100644
index 6e2cef0143f5267..000000000000000
--- a/clang/test/Driver/Inputs/hexagon_tree/Tools/bin/readme
+++ /dev/null
@@ -1,4 +0,0 @@
-Git does not record empty directories. Create a dummy file in each directory
-here. Strictly speaking, putting dummy files in leaf directories should be
-sufficient, but adding them everywhere reduces the risk of repeating the same
-problem in case new directories are added.
diff --git a/clang/test/Driver/hexagon-hvx-ieee-fp.c b/clang/test/Driver/hexagon-hvx-ieee-fp.c
index 4166d640b6faa51..c42ee77cc2a9297 100644
--- a/clang/test/Driver/hexagon-hvx-ieee-fp.c
+++ b/clang/test/Driver/hexagon-hvx-ieee-fp.c
@@ -2,24 +2,24 @@
// Tests for the hvx ieee fp feature and errors.
// -----------------------------------------------------------------------------
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 -mhvx -mhvx-ieee-fp \
-// RUN: 2>&1 | FileCheck -check-prefix=CHECK-IEEEFP %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv66 -mhvx=v68 -mhvx-ieee-fp \
-// RUN: 2>&1 | FileCheck -check-prefix=CHECK-IEEEFP %s
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx -mhvx-ieee-fp \
+// RUN: 2>&1 | FileCheck -check-prefix=CHECK-IEEEFP %s
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv66 -mhvx=v68 -mhvx-ieee-fp \
+// RUN: 2>&1 | FileCheck -check-prefix=CHECK-IEEEFP %s
// CHECK-IEEEFP: "-target-feature" "+hvx-ieee-fp"
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 -mhvx -mhvx-ieee-fp \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx -mhvx-ieee-fp \
// RUN: -mno-hvx-ieee-fp 2>&1 | FileCheck -check-prefix=CHECK-NO-IEEEFP %s
// CHECK-NO-IEEEFP: "-target-feature" "-hvx-ieee-fp"
// IEEE-FP is valid only on hvxv68 and hvxv68+.
// RUN: not %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx=v66 \
-// RUN: -mhvx-ieee-fp 2>&1 | FileCheck -check-prefix=CHECK-ERROR1 %s
+// RUN: -mhvx-ieee-fp 2>&1 | FileCheck -check-prefix=CHECK-ERROR1 %s
// RUN: not %clang -c %s -### --target=hexagon-unknown-elf -mv66 -mhvx -mhvx-ieee-fp \
-// RUN: 2>&1 | FileCheck -check-prefix=CHECK-ERROR1 %s
+// RUN: 2>&1 | FileCheck -check-prefix=CHECK-ERROR1 %s
// CHECK-ERROR1: error: -mhvx-ieee-fp is not supported on HVX v66
// IEEE-FP is valid only if HVX is enabled.
// RUN: not %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx-ieee-fp \
-// RUN: 2>&1 | FileCheck -check-prefix=CHECK-ERROR2 %s
+// RUN: 2>&1 | FileCheck -check-prefix=CHECK-ERROR2 %s
// CHECK-ERROR2: error: -mhvx-ieee-fp requires HVX, use -mhvx/-mhvx= to enable it
diff --git a/clang/test/Driver/hexagon-hvx-qfloat.c b/clang/test/Driver/hexagon-hvx-qfloat.c
index ac3de8ded16ebd6..f3662da040a8fcf 100644
--- a/clang/test/Driver/hexagon-hvx-qfloat.c
+++ b/clang/test/Driver/hexagon-hvx-qfloat.c
@@ -2,13 +2,13 @@
// Tests for the hvx qfloat feature and errors.
// -----------------------------------------------------------------------------
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 -mhvx -mhvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx -mhvx-qfloat \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-QFLOAT %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv66 -mhvx=v68 -mhvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv66 -mhvx=v68 -mhvx-qfloat \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-QFLOAT %s
// CHECK-QFLOAT: "-target-feature" "+hvx-qfloat"
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 -mhvx -mhvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx -mhvx-qfloat \
// RUN: -mno-hvx-qfloat 2>&1 | FileCheck -check-prefix=CHECK-NO-QFLOAT %s
// CHECK-NO-QFLOAT: "-target-feature" "-hvx-qfloat"
diff --git a/clang/test/Driver/hexagon-hvx.c b/clang/test/Driver/hexagon-hvx.c
index b57cc22515c2979..d21d88701ba5eff 100644
--- a/clang/test/Driver/hexagon-hvx.c
+++ b/clang/test/Driver/hexagon-hvx.c
@@ -8,31 +8,31 @@
// CHECK-HVX-ON-NOT: "-target-feature" "-hvx
// CHECK-HVX-OFF-NOT: "-target-feature" "+hvx
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv5 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv5 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv55 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv55 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv60 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv60 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv62 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv62 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv65 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv65 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv66 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv66 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv67 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv67 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv67t \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv67t \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv71 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv71 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv71t \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv71t \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv73 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv73 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
// Infer HVX version from flag:
@@ -48,126 +48,126 @@
// CHECK-HVX-V73: "-target-feature" "+hvxv73"
// Direct version flag:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v60 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v60 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V60 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v62 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v62 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V62 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v65 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v65 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V65 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v66 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v66 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V66 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v67 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v67 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v68 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v68 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V68 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v69 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V69 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v71 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v71 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V71 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v73 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v73 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V73 %s
// Infer HVX version from CPU version:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv60 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv60 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V60 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv62 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv62 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V62 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv65 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv65 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V65 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv66 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv66 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V66 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv67 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv67 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv67t -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv67t -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V68 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V69 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv71 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv71 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V71 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv73 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv73 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V73 %s
// Direct version flag with
diff erent CPU version:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v60 -mv62 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v60 -mv62 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V60 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v62 -mv65 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v62 -mv65 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V62 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v65 -mv66 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v65 -mv66 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V65 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v66 -mv67 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v66 -mv67 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V66 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v67 -mv68 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v67 -mv68 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v68 -mv69 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v68 -mv69 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V68 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v69 -mv71 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 -mv71 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V69 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v71 -mv73 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v71 -mv73 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V71 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v73 -mv60 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v73 -mv60 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V73 %s
// Direct version flag with
diff erent CPU version and versionless -mhvx:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v60 -mv62 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v60 -mv62 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V62 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v62 -mv65 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v62 -mv65 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V65 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v65 -mv66 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v65 -mv66 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V66 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v66 -mv67 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v66 -mv67 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v67 -mv68 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v67 -mv68 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V68 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v68 -mv69 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v68 -mv69 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V69 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v69 -mv71 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 -mv71 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V71 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v71 -mv73 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v71 -mv73 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V73 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v73 -mv60 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v73 -mv60 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V60 %s
// Direct version flag with
diff erent CPU version, versionless -mhvx
// and -mno-hvx. The -mno-hvx cancels -mhvx=, versionless -mhvx wins:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v60 -mno-hvx -mv62 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v60 -mno-hvx -mv62 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V62 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v62 -mno-hvx -mv65 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v62 -mno-hvx -mv65 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V65 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v65 -mno-hvx -mv66 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v65 -mno-hvx -mv66 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V66 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v66 -mno-hvx -mv67 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v66 -mno-hvx -mv67 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v67 -mno-hvx -mv68 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v67 -mno-hvx -mv68 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V68 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v68 -mno-hvx -mv69 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v68 -mno-hvx -mv69 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V69 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v69 -mno-hvx -mv71 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 -mno-hvx -mv71 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V71 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v71 -mno-hvx -mv73 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v71 -mno-hvx -mv73 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V73 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v73 -mno-hvx -mv60 -mhvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v73 -mno-hvx -mv60 -mhvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V60 %s
// Direct version flag with
diff erent CPU version, versionless -mhvx
// and -mno-hvx. The -mno-hvx cancels versionless -mhvx, -mhvx= wins:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv62 -mhvx -mno-hvx -mhvx=v60 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv62 -mhvx -mno-hvx -mhvx=v60 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V60 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv65 -mhvx -mno-hvx -mhvx=v62 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv65 -mhvx -mno-hvx -mhvx=v62 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V62 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv66 -mhvx -mno-hvx -mhvx=v65 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv66 -mhvx -mno-hvx -mhvx=v65 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V65 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv67 -mhvx -mno-hvx -mhvx=v66 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv67 -mhvx -mno-hvx -mhvx=v66 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V66 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv68 -mhvx -mno-hvx -mhvx=v67 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv68 -mhvx -mno-hvx -mhvx=v67 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V67 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mno-hvx -mhvx=v68 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mno-hvx -mhvx=v68 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V68 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv71 -mhvx -mno-hvx -mhvx=v69 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv71 -mhvx -mno-hvx -mhvx=v69 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V69 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv73 -mhvx -mno-hvx -mhvx=v71 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv73 -mhvx -mno-hvx -mhvx=v71 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V71 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv60 -mhvx -mno-hvx -mhvx=v73 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv60 -mhvx -mno-hvx -mhvx=v73 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-V73 %s
// Infer HVX length from flag:
@@ -177,33 +177,33 @@
// CHECK-HVX-L128: "-target-feature" "+hvx-length128b"
// CHECK-HVX-L128-NOT: "-target-feature" "+hvx-length64b"
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx -mhvx-length=64b \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx -mhvx-length=64b \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L64 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx -mhvx-length=128b \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx -mhvx-length=128b \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L128 %s
// Infer HVX length from HVX version:
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v60 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v60 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L64 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v62 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v62 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L64 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v65 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v65 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L64 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v66 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v66 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L128 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v67 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v67 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L128 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v68 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v68 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L128 %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v69 \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-L128 %s
// No HVX with trailing -mno-hvx
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mhvx=v69 -mno-hvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 -mno-hvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mno-hvx \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mno-hvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
// RUN: not %clang -c %s -### --target=hexagon-unknown-elf -mhvx=v69 -mhvx-length=128b -mno-hvx \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-OFF %s
@@ -217,22 +217,22 @@
// CHECK-HVX-IEEE-ON: "-target-feature" "+hvx-ieee-fp"
// CHECK-HVX-IEEE-OFF-NOT: "-target-feature" "+hvx-ieee-fp"
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mhvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mhvx-qfloat \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-QFLOAT-ON %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mno-hvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mno-hvx-qfloat \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-QFLOAT-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mno-hvx-qfloat -mhvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mno-hvx-qfloat -mhvx-qfloat \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-QFLOAT-ON %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mhvx-qfloat -mno-hvx-qfloat \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mhvx-qfloat -mno-hvx-qfloat \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-QFLOAT-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mhvx-ieee-fp \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mhvx-ieee-fp \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-IEEE-ON %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mno-hvx-ieee-fp \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mno-hvx-ieee-fp \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-IEEE-OFF %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mno-hvx-ieee-fp -mhvx-ieee-fp \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mno-hvx-ieee-fp -mhvx-ieee-fp \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-IEEE-ON %s
-// RUN: %clang -c %s -### -target hexagon-unknown-elf -mv69 -mhvx -mhvx-ieee-fp -mno-hvx-ieee-fp \
+// RUN: %clang -c %s -### --target=hexagon-unknown-elf -mv69 -mhvx -mhvx-ieee-fp -mno-hvx-ieee-fp \
// RUN: 2>&1 | FileCheck -check-prefix=CHECK-HVX-IEEE-OFF %s
// HVX flags heed HVX:
diff --git a/clang/test/Driver/hexagon-long-calls.c b/clang/test/Driver/hexagon-long-calls.c
index e88922a3c236496..368ce8d0f742748 100644
--- a/clang/test/Driver/hexagon-long-calls.c
+++ b/clang/test/Driver/hexagon-long-calls.c
@@ -1,10 +1,10 @@
-// RUN: %clang -target hexagon -### %s 2>&1 \
+// RUN: %clang --target=hexagon -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-DEFAULT
-// RUN: %clang -target hexagon -### -mlong-calls %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mlong-calls %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-LONG-CALLS
-// RUN: %clang -target hexagon -### -mlong-calls -mno-long-calls %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mlong-calls -mno-long-calls %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NO-LONG-CALLS
// CHECK-DEFAULT-NOT: "-target-feature" "+long-calls"
diff --git a/clang/test/Driver/hexagon-memops.c b/clang/test/Driver/hexagon-memops.c
index e7a94286ffdad8a..b160fcc5ab93df5 100644
--- a/clang/test/Driver/hexagon-memops.c
+++ b/clang/test/Driver/hexagon-memops.c
@@ -1,7 +1,7 @@
-// RUN: %clang -target hexagon -### -mmemops %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mmemops %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-MEMOPS
-// RUN: %clang -target hexagon -### -mno-memops %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mno-memops %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NO-MEMOPS
// CHECK-MEMOPS: "-target-feature" "+memops"
diff --git a/clang/test/Driver/hexagon-nvj.c b/clang/test/Driver/hexagon-nvj.c
index 60d3839f83ac8fe..3f25f3bf2880c5b 100644
--- a/clang/test/Driver/hexagon-nvj.c
+++ b/clang/test/Driver/hexagon-nvj.c
@@ -1,7 +1,7 @@
-// RUN: %clang -target hexagon -### -mnvj %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mnvj %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NVJ
-// RUN: %clang -target hexagon -### -mno-nvj %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mno-nvj %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NO-NVJ
// CHECK-NVJ: "-target-feature" "+nvj"
diff --git a/clang/test/Driver/hexagon-nvs.c b/clang/test/Driver/hexagon-nvs.c
index a0130e32c9fd022..89f1e91a75e2b91 100644
--- a/clang/test/Driver/hexagon-nvs.c
+++ b/clang/test/Driver/hexagon-nvs.c
@@ -1,7 +1,7 @@
-// RUN: %clang -target hexagon -### -mnvs %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mnvs %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NVS
-// RUN: %clang -target hexagon -### -mno-nvs %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mno-nvs %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NO-NVS
// CHECK-NVS: "-target-feature" "+nvs"
diff --git a/clang/test/Driver/hexagon-packets.c b/clang/test/Driver/hexagon-packets.c
index 820c7314344f689..31521df2bdfe2e4 100644
--- a/clang/test/Driver/hexagon-packets.c
+++ b/clang/test/Driver/hexagon-packets.c
@@ -1,7 +1,7 @@
-// RUN: %clang -target hexagon -### -mpackets %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mpackets %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-PACKETS
-// RUN: %clang -target hexagon -### -mno-packets %s 2>&1 \
+// RUN: %clang --target=hexagon -### -mno-packets %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-NO-PACKETS
// CHECK-PACKETS: "-target-feature" "+packets"
diff --git a/clang/test/Driver/hexagon-toolchain-elf.c b/clang/test/Driver/hexagon-toolchain-elf.c
index 039b87347436d51..b868024d41b9bab 100644
--- a/clang/test/Driver/hexagon-toolchain-elf.c
+++ b/clang/test/Driver/hexagon-toolchain-elf.c
@@ -2,16 +2,12 @@
// Test standard include paths
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
-// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK000 %s
+// RUN: %clang -### --target=hexagon-unknown-elf \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin %s 2>&1 | FileCheck -check-prefix=CHECK000 %s
// CHECK000: "-cc1" {{.*}} "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/include"
-// RUN: %clangxx -### -target hexagon-unknown-elf \
-// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK001 %s
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin %s 2>&1 | FileCheck -check-prefix=CHECK001 %s
// CHECK001: "-cc1" {{.*}} "-internal-isystem" "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/include/c++"
// CHECK001: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/include"
@@ -19,37 +15,29 @@
// Test -nostdinc, -nostdlibinc, -nostdinc++
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -nostdinc \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK110 %s
+// RUN: -nostdinc %s 2>&1 | FileCheck -check-prefix=CHECK110 %s
// CHECK110: "-cc1"
// CHECK110-NOT: "-internal-externc-isystem"
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -nostdlibinc \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK111 %s
+// RUN: -nostdlibinc %s 2>&1 | FileCheck -check-prefix=CHECK111 %s
// CHECK111: "-cc1"
// CHECK111-NOT: "-internal-externc-isystem"
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -nostdinc++ \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK112 %s
+// RUN: -nostdinc++ %s 2>&1 | FileCheck -check-prefix=CHECK112 %s
// CHECK112: "-cc1"
// CHECK112-NOT: "-internal-isystem"
// CHECK112-DAG: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/include"
-// RUN: %clangxx -### -target hexagon-unknown-elf -fno-integrated-as \
+// RUN: %clangxx -### --target=hexagon-unknown-elf -fno-integrated-as \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
// RUN: --gcc-toolchain="" \
-// RUN: -nostdlibinc \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK113 %s
+// RUN: -nostdlibinc %s 2>&1 | FileCheck -check-prefix=CHECK113 %s
// CHECK113: "-cc1"
// CHECK113-NOT: "-internal-isystem"
// CHECK113-NOT: "-internal-externc-isystem"
@@ -57,137 +45,111 @@
// -----------------------------------------------------------------------------
// Test -mcpu=<cpuname> -mv<number>
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv5 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK221 %s
+// RUN: -mcpu=hexagonv5 %s 2>&1 | FileCheck -check-prefix=CHECK221 %s
// CHECK221: "-cc1" {{.*}} "-target-cpu" "hexagonv5"
// CHECK221: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v5/crt0
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv55 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK222 %s
+// RUN: -mcpu=hexagonv55 %s 2>&1 | FileCheck -check-prefix=CHECK222 %s
// CHECK222: "-cc1" {{.*}} "-target-cpu" "hexagonv55"
// CHECK222: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v55/crt0
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK223 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK223 %s
// CHECK223: "-cc1" {{.*}} "-target-cpu" "hexagonv60"
// CHECK223: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv62 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK224 %s
+// RUN: -mcpu=hexagonv62 %s 2>&1 | FileCheck -check-prefix=CHECK224 %s
// CHECK224: "-cc1" {{.*}} "-target-cpu" "hexagonv62"
// CHECK224: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v62/crt0
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv65 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK225 %s
+// RUN: -mcpu=hexagonv65 %s 2>&1 | FileCheck -check-prefix=CHECK225 %s
// CHECK225: "-cc1" {{.*}} "-target-cpu" "hexagonv65"
// CHECK225: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v65/crt0
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv66 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK226 %s
+// RUN: -mcpu=hexagonv66 %s 2>&1 | FileCheck -check-prefix=CHECK226 %s
// CHECK226: "-cc1" {{.*}} "-target-cpu" "hexagonv66"
// CHECK226: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v66/crt0
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -O3 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK227 %s
+// RUN: -O3 %s 2>&1 | FileCheck -check-prefix=CHECK227 %s
// CHECK227-NOT: "-ffp-contract=fast"
// CHECK227: {{hexagon-link|ld}}
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -O3 -ffp-contract=off \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK228 %s
+// RUN: -O3 -ffp-contract=off %s 2>&1 | FileCheck -check-prefix=CHECK228 %s
// CHECK228-NOT: "-ffp-contract=fast"
// CHECK228: {{hexagon-link|ld}}
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv65 -march=hexagon\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK229 %s
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK229 %s
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mv65 -march=hexagon\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK229 %s
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK229 %s
// CHECK229: "-cc1" {{.*}} "-target-cpu" "hexagonv65"
// CHECK229: {{hexagon-link|ld}}{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v65/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv67 -fuse-ld=hexagon-link\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK22A %s
+// RUN: -mcpu=hexagonv67 -fuse-ld=hexagon-link \
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK22A %s
// CHECK22A: "-cc1" {{.*}} "-target-cpu" "hexagonv67"
// CHECK22A: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v67/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv67t \
-// RUN: -fuse-ld=fake-value-to-ignore-CLANG_DEFAULT_LINKER \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK22B %s
+// RUN: -fuse-ld=fake-value-to-ignore-CLANG_DEFAULT_LINKER %s 2>&1 | FileCheck -check-prefix=CHECK22B %s
// CHECK22B: "-cc1" {{.*}} "-target-cpu" "hexagonv67t"
// CHECK22B: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v67t/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv68 -fuse-ld=hexagon-link\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK22C %s
+// RUN: -mcpu=hexagonv68 -fuse-ld=hexagon-link \
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK22C %s
// CHECK22C: "-cc1" {{.*}} "-target-cpu" "hexagonv68"
// CHECK22C: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v68/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv69 -fuse-ld=hexagon-link\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK22D %s
+// RUN: -mcpu=hexagonv69 -fuse-ld=hexagon-link \
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK22D %s
// CHECK22D: "-cc1" {{.*}} "-target-cpu" "hexagonv69"
// CHECK22D: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v69/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv71 -fuse-ld=hexagon-link\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK22E %s
+// RUN: -mcpu=hexagonv71 -fuse-ld=hexagon-link \
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK22E %s
// CHECK22E: "-cc1" {{.*}} "-target-cpu" "hexagonv71"
// CHECK22E: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v71/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv71t -fuse-ld=hexagon-link\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK22F %s
+// RUN: -mcpu=hexagonv71t -fuse-ld=hexagon-link \
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK22F %s
// CHECK22F: "-cc1" {{.*}} "-target-cpu" "hexagonv71t"
// CHECK22F: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v71t/crt0
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv73 -fuse-ld=hexagon-link\
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK230 %s
+// RUN: -mcpu=hexagonv73 -fuse-ld=hexagon-link \
+// RUN: %s 2>&1 | FileCheck -check-prefix=CHECK230 %s
// CHECK230: "-cc1" {{.*}} "-target-cpu" "hexagonv73"
// CHECK230: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v73/crt0
@@ -198,11 +160,9 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Defaults for C
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK330 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK330 %s
// CHECK330: "-cc1"
// CHECK330: {{hexagon-link|ld}}
// CHECK330-NOT: "-static"
@@ -219,34 +179,29 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Defaults for C++
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK331 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK331 %s
// CHECK331: "-cc1"
// CHECK331: {{hexagon-link|ld}}
// CHECK331-NOT: "-static"
// CHECK331-NOT: "-shared"
// CHECK331: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0_standalone.o"
-// CHECK331: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
-// CHECK331: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
-// CHECK331: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
-// CHECK331: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
-// CHECK331: "{{[^"]+}}.o"
-// CHECK331: "-lstdc++" "-lm"
-// CHECK331: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK331: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
+// CHECK331-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
+// CHECK331-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
+// CHECK331-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
+// CHECK331-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
+// CHECK331-SAME: "{{[^"]+}}.o"
+// CHECK331-SAME: "-lstdc++" "-lm" "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
+// CHECK331-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Additional Libraries (-L)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -Lone -L two -L three \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK332 %s
+// RUN: -Lone -L two -L three %s 2>&1 | FileCheck -check-prefix=CHECK332 %s
// CHECK332: "-cc1"
// CHECK332: {{hexagon-link|ld}}
// CHECK332-NOT: "-static"
@@ -264,12 +219,10 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// -static, -shared
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -static \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK333 %s
+// RUN: -static %s 2>&1 | FileCheck -check-prefix=CHECK333 %s
// CHECK333: "-cc1"
// CHECK333: {{hexagon-link|ld}}
// CHECK333: "-static"
@@ -282,12 +235,10 @@
// CHECK333: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
// CHECK333: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -shared \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK334 %s
+// RUN: -shared %s 2>&1 | FileCheck -check-prefix=CHECK334 %s
// CHECK334: "-cc1"
// CHECK334: {{hexagon-link|ld}}
// CHECK334: "-shared" "-call_shared"
@@ -305,39 +256,34 @@
// CHECK334: "--end-group"
// CHECK334: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/G0/pic/finiS.o"
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: -shared \
-// RUN: -static \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK335 %s
+// RUN: -static %s 2>&1 | FileCheck -check-prefix=CHECK335 %s
// CHECK335: "-cc1"
// CHECK335: {{hexagon-link|ld}}
// CHECK335: "-shared" "-call_shared" "-static"
// CHECK335-NOT: crt0_standalone.o
// CHECK335-NOT: crt0.o
// CHECK335: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/G0/init.o"
-// CHECK335: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/G0"
-// CHECK335: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
-// CHECK335: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
-// CHECK335: "{{[^"]+}}.o"
-// CHECK335: "--start-group"
+// CHECK335-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/G0"
+// CHECK335-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
+// CHECK335-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
+// CHECK335-SAME: "{{[^"]+}}.o"
+// CHECK335-SAME: "--start-group"
// CHECK335-NOT: "-lstandalone"
// CHECK335-NOT: "-lc"
-// CHECK335: "-lgcc"
-// CHECK335: "--end-group"
-// CHECK335: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/G0/fini.o"
+// CHECK335-SAME: "-lgcc" "--end-group"
+// CHECK335-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/G0/fini.o"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// -nostdlib, -nostartfiles, -nodefaultlibs
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -nostdlib \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK336 %s
+// RUN: -nostdlib %s 2>&1 | FileCheck -check-prefix=CHECK336 %s
// CHECK336: "-cc1"
// CHECK336: {{hexagon-link|ld}}
// CHECK336-NOT: crt0_standalone.o
@@ -355,12 +301,10 @@
// CHECK336-NOT: "--end-group"
// CHECK336-NOT: fini.o
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -nostartfiles \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK337 %s
+// RUN: -nostartfiles %s 2>&1 | FileCheck -check-prefix=CHECK337 %s
// CHECK337: "-cc1"
// CHECK337: {{hexagon-link|ld}}
// CHECK337-NOT: crt0_standalone.o
@@ -369,21 +313,13 @@
// CHECK337: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
// CHECK337: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
// CHECK337: "{{[^"]+}}.o"
-// CHECK337: "-lstdc++"
-// CHECK337: "-lm"
-// CHECK337: "--start-group"
-// CHECK337: "-lstandalone"
-// CHECK337: "-lc"
-// CHECK337: "-lgcc"
-// CHECK337: "--end-group"
+// CHECK337: "-lstdc++" "-lm" "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
// CHECK337-NOT: fini.o
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -nodefaultlibs \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK338 %s
+// RUN: -nodefaultlibs %s 2>&1 | FileCheck -check-prefix=CHECK338 %s
// CHECK338: "-cc1"
// CHECK338: {{hexagon-link|ld}}
// CHECK338: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0_standalone.o"
@@ -404,101 +340,82 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// -moslib
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -moslib=first -moslib=second \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK339 %s
+// RUN: -moslib=first -moslib=second %s 2>&1 | FileCheck -check-prefix=CHECK339 %s
// CHECK339: "-cc1"
// CHECK339: {{hexagon-link|ld}}
// CHECK339-NOT: "-static"
// CHECK339-NOT: "-shared"
// CHECK339-NOT: crt0_standalone.o
// CHECK339: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
-// CHECK339: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
-// CHECK339: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
-// CHECK339: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
-// CHECK339: "{{[^"]+}}.o"
-// CHECK339: "--start-group"
-// CHECK339: "-lfirst" "-lsecond"
+// CHECK339-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
+// CHECK339-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
+// CHECK339-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
+// CHECK339-SAME: "{{[^"]+}}.o"
+// CHECK339-SAME: "--start-group" "-lfirst" "-lsecond"
// CHECK339-NOT: "-lstandalone"
-// CHECK339: "-lc" "-lgcc" "--end-group"
-// CHECK339: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
+// CHECK339-SAME: "-lc" "-lgcc" "--end-group"
+// CHECK339-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -moslib=first -moslib=second -moslib=standalone \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK33A %s
+// RUN: -moslib=first -moslib=second -moslib=standalone %s 2>&1 | FileCheck -check-prefix=CHECK33A %s
// CHECK33A: "-cc1"
// CHECK33A: {{hexagon-link|ld}}
// CHECK33A-NOT: "-static"
// CHECK33A-NOT: "-shared"
-// CHECK33A: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0_standalone.o"
-// CHECK33A: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
-// CHECK33A: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
-// CHECK33A: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
-// CHECK33A: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
-// CHECK33A: "{{[^"]+}}.o"
-// CHECK33A: "--start-group"
-// CHECK33A: "-lfirst" "-lsecond"
-// CHECK33A: "-lstandalone"
-// CHECK33A: "-lc" "-lgcc" "--end-group"
-// CHECK33A: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
+// CHECK33A: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0_standalone.o"
+// CHECK33A-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
+// CHECK33A-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
+// CHECK33A-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
+// CHECK33A-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
+// CHECK33A-SAME: "{{[^"]+}}.o"
+// CHECK33A-SAME: "--start-group"
+// CHECK33A-SAME: "-lfirst" "-lsecond"
+// CHECK33A-SAME: "-lstandalone"
+// CHECK33A-SAME: "-lc" "-lgcc" "--end-group"
+// CHECK33A-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Other args to pass to linker
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -s \
-// RUN: -t \
-// RUN: -e start_here \
-// RUN: -uFoo -undefined Bar \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK33B %s
-// CHECK33B: "-cc1"
-// CHECK33B: {{hexagon-link|ld}}
-// CHECK33B: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0_standalone.o"
-// CHECK33B: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
-// CHECK33B: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
-// CHECK33B: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
-// CHECK33B: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
-// CHECK33B: "-s"
-// CHECK33B: "-t"
-// CHECK33B: "-u" "Foo" "-undefined" "Bar"
-// CHECK33B: "{{[^"]+}}.o"
-// CHECK33B: "-lstdc++" "-lm"
-// CHECK33B: "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
-// CHECK33B: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
+// RUN: -s -t -e start_here -uFoo -undefined Bar %s 2>&1 | FileCheck -check-prefix=CHECK33B %s
+// CHECK33B: "-cc1"
+// CHECK33B: {{hexagon-link|ld}}
+// CHECK33B-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0_standalone.o"
+// CHECK33B-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/crt0.o"
+// CHECK33B-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/init.o"
+// CHECK33B-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60"
+// CHECK33B-SAME: "-L{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib"
+// CHECK33B-SAME: "-s" "-t" "-u" "Foo" "-undefined" "Bar"
+// CHECK33B-SAME: "{{[^"]+}}.o"
+// CHECK33B-SAME: "-lstdc++" "-lm" "--start-group" "-lstandalone" "-lc" "-lgcc" "--end-group"
+// CHECK33B-SAME: "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v60/fini.o"
// -----------------------------------------------------------------------------
// pic, small data threshold
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK340 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK340 %s
// CHECK340: "-cc1"
// CHECK340: {{hexagon-link|ld}}
// CHECK340-NOT: "-G{{[0-9]+}}"
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -fpic \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK341 %s
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: -fpic %s 2>&1 | FileCheck -check-prefix=CHECK341 %s
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -fPIC \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK341 %s
+// RUN: -fPIC %s 2>&1 | FileCheck -check-prefix=CHECK341 %s
// CHECK341: "-cc1"
// CHECK341-NOT: "-mrelocation-model" "static"
// CHECK341: "-pic-level" "{{[12]}}"
@@ -506,24 +423,18 @@
// CHECK341: {{hexagon-link|ld}}
// CHECK341: "-G0"
-// RUN: %clang -### -target hexagon-unknown-elf -fno-integrated-as -fno-pie -no-pie \
+// RUN: %clang -### --target=hexagon-unknown-elf -fno-integrated-as -fno-pie -no-pie \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -G=8 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK342 %s
-// RUN: %clang -### -target hexagon-unknown-elf -fno-integrated-as -fno-pie -no-pie \
+// RUN: -G=8 %s 2>&1 | FileCheck -check-prefix=CHECK342 %s
+// RUN: %clang -### --target=hexagon-unknown-elf -fno-integrated-as -fno-pie -no-pie \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -G 8 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK342 %s
-// RUN: %clang -### -target hexagon-unknown-elf -fno-integrated-as -fno-pie -no-pie \
+// RUN: -G 8 %s 2>&1 | FileCheck -check-prefix=CHECK342 %s
+// RUN: %clang -### --target=hexagon-unknown-elf -fno-integrated-as -fno-pie -no-pie \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -msmall-data-threshold=8 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK342 %s
+// RUN: -msmall-data-threshold=8 %s 2>&1 | FileCheck -check-prefix=CHECK342 %s
// CHECK342: "-cc1"
// CHECK342: "-mrelocation-model" "static"
// CHECK342: "-mllvm" "-hexagon-small-data-threshold=8"
@@ -535,22 +446,18 @@
// -----------------------------------------------------------------------------
// pie
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -pie \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK350 %s
+// RUN: -pie %s 2>&1 | FileCheck -check-prefix=CHECK350 %s
// CHECK350: "-cc1"
// CHECK350: {{hexagon-link|ld}}
// CHECK350: "-pie"
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -pie -shared \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK351 %s
+// RUN: -pie -shared %s 2>&1 | FileCheck -check-prefix=CHECK351 %s
// CHECK351: "-cc1"
// CHECK351: {{hexagon-link|ld}}
// CHECK351-NOT: "-pie"
@@ -558,14 +465,12 @@
// -----------------------------------------------------------------------------
// Test Assembler related args
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf -fno-integrated-as \
+// RUN: %clang -### --target=hexagon-unknown-elf -fno-integrated-as \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: -gdwarf-2 \
// RUN: -Wa,--noexecstack,--trap \
-// RUN: -Xassembler --keep-locals \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK360 %s
+// RUN: -Xassembler --keep-locals %s 2>&1 | FileCheck -check-prefix=CHECK360 %s
// CHECK360: "-cc1"
// CHECK360-NEXT: llvm-mc
// CHECK360: "--noexecstack" "--trap" "--keep-locals"
@@ -574,33 +479,31 @@
// -----------------------------------------------------------------------------
// ffixed-r19
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf -ffixed-r19 %s 2>&1 \
+// RUN: %clang -### --target=hexagon-unknown-elf -ffixed-r19 %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK370 %s
// CHECK370: "-target-feature" "+reserved-r19"
-// RUN: %clang -### -target hexagon-unknown-elf %s 2>&1 \
+// RUN: %clang -### --target=hexagon-unknown-elf %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK371 %s
// CHECK371-NOT: "+reserved-r19"
// -----------------------------------------------------------------------------
// mcabac
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf -mcabac %s 2>&1 \
+// RUN: %clang -### --target=hexagon-unknown-elf -mcabac %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK372 %s
// CHECK372: "-target-feature" "+cabac"
-// RUN: %clang -### -target hexagon-unknown-elf %s 2>&1 \
+// RUN: %clang -### --target=hexagon-unknown-elf %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK373 %s
// CHECK373-NOT: "+cabac"
// -----------------------------------------------------------------------------
// Misc Defaults
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK380 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK380 %s
// CHECK380: "-cc1"
-// CHECK380: "-Wreturn-type"
+// CHECK380-SAME: "-Wreturn-type"
// -----------------------------------------------------------------------------
// Default, hexagon-link is used
@@ -608,40 +511,32 @@
// RUN: not %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -fuse-ld=fake-value-to-ignore-CLANG_DEFAULT_LINKER \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK381 %s
+// RUN: -fuse-ld=fake-value-to-ignore-CLANG_DEFAULT_LINKER %s 2>&1 | FileCheck -check-prefix=CHECK381 %s
// REQUIRES: hexagon-registered-target
// CHECK381: "-march=hexagon"
// CHECK381: "-mcpu=hexagonv60"
// -----------------------------------------------------------------------------
// Passing -fuse-ld=lld
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: -fuse-ld=lld \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK382 %s
-// CHECK382-NOT: -march=
-// CHECK382-NOT: -mcpu=
+// RUN: -fuse-ld=lld %s 2>&1 | FileCheck -check-prefix=CHECK382 %s
+// CHECK382-NOT: "-march=
+// CHECK382-NOT: "-mcpu=
// -----------------------------------------------------------------------------
// Passing --sysroot
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: --sysroot=/hexagon \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK383 %s
+// RUN: --sysroot=/hexagon %s 2>&1 | FileCheck -check-prefix=CHECK383 %s
// CHECK383: "-isysroot" "/hexagon"
// CHECK383: "-internal-externc-isystem" "/hexagon{{/|\\\\}}include"
// -----------------------------------------------------------------------------
// Passing -fno-use-init-array
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-elf \
+// RUN: %clang -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK384 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK384 %s
// CHECK384: "-fno-use-init-array"
diff --git a/clang/test/Driver/hexagon-toolchain-linux.c b/clang/test/Driver/hexagon-toolchain-linux.c
index 423306affdce3ac..51aa6ec90dc017b 100644
--- a/clang/test/Driver/hexagon-toolchain-linux.c
+++ b/clang/test/Driver/hexagon-toolchain-linux.c
@@ -3,13 +3,11 @@
// -----------------------------------------------------------------------------
// Passing --musl
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: -fuse-ld=lld \
-// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK000 %s
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree %s 2>&1 | FileCheck -check-prefix=CHECK000 %s
// CHECK000-NOT: {{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crti.o
// CHECK000: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK000: "{{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crt1.o"
@@ -17,12 +15,10 @@
// -----------------------------------------------------------------------------
// Passing --musl --shared
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -shared \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK001 %s
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -shared %s 2>&1 | FileCheck -check-prefix=CHECK001 %s
// CHECK001-NOT: -dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1
// CHECK001: "{{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crti.o"
// CHECK001: "-lclang_rt.builtins-hexagon" "-lc"
@@ -30,12 +26,10 @@
// -----------------------------------------------------------------------------
// Passing --musl -nostdlib
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -nostdlib \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK002 %s
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -nostdlib %s 2>&1 | FileCheck -check-prefix=CHECK002 %s
// CHECK002: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK002-NOT: {{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crti.o
// CHECK002-NOT: {{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crt1.o
@@ -44,12 +38,10 @@
// -----------------------------------------------------------------------------
// Passing --musl -nostartfiles
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -nostartfiles \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK003 %s
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -nostartfiles %s 2>&1 | FileCheck -check-prefix=CHECK003 %s
// CHECK003: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK003-NOT: {{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}Scrt1.o
// CHECK003-NOT: {{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crt1.o
@@ -57,12 +49,10 @@
// -----------------------------------------------------------------------------
// Passing --musl -nodefaultlibs
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
-// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -nodefaultlibs \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK004 %s
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -nodefaultlibs %s 2>&1 | FileCheck -check-prefix=CHECK004 %s
// CHECK004: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK004: "{{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}lib{{/|\\\\}}crt1.o"
// CHECK004-NOT: "-lclang_rt.builtins-hexagon"
@@ -70,51 +60,41 @@
// -----------------------------------------------------------------------------
// Not Passing -fno-use-init-array when musl is selected
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK005 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK005 %s
// CHECK005-NOT: -fno-use-init-array
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// c++ when musl is selected
// -----------------------------------------------------------------------------
-// RUN: %clangxx -### -target hexagon-unknown-linux-musl \
+// RUN: %clangxx -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK006 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK006 %s
// CHECK006: "-internal-isystem" "{{.*}}basic_linux_libcxx_tree{{/|\\\\}}usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
// -----------------------------------------------------------------------------
// c++ when musl is selected
// -----------------------------------------------------------------------------
-// RUN: %clangxx -### -target hexagon-unknown-elf \
+// RUN: %clangxx -### --target=hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -stdlib=libc++ \
-// RUN: -mcpu=hexagonv60 \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK007 %s
+// RUN: -mcpu=hexagonv60 %s 2>&1 | FileCheck -check-prefix=CHECK007 %s
// CHECK007: "-internal-isystem" "{{.*}}hexagon{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
// -----------------------------------------------------------------------------
// internal-isystem for linux with and without musl
// -----------------------------------------------------------------------------
-// RUN: %clang -### -target hexagon-unknown-linux-musl \
+// RUN: %clang -### --target=hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -resource-dir=%S/Inputs/resource_dir \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK008 %s
+// RUN: -resource-dir=%S/Inputs/resource_dir %s 2>&1 | FileCheck -check-prefix=CHECK008 %s
// CHECK008: InstalledDir: [[INSTALLED_DIR:.+]]
// CHECK008: "-resource-dir" "[[RESOURCE:[^"]+]]"
// CHECK008-SAME: {{^}} "-internal-isystem" "[[RESOURCE]]/include"
// CHECK008-SAME: {{^}} "-internal-externc-isystem" "[[INSTALLED_DIR]]/../target/hexagon/include"
-// RUN: %clang -### -target hexagon-unknown-linux \
+// RUN: %clang -### --target=hexagon-unknown-linux \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
-// RUN: -resource-dir=%S/Inputs/resource_dir \
-// RUN: %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHECK009 %s
+// RUN: -resource-dir=%S/Inputs/resource_dir %s 2>&1 | FileCheck -check-prefix=CHECK009 %s
// CHECK009: InstalledDir: [[INSTALLED_DIR:.+]]
// CHECK009: "-resource-dir" "[[RESOURCE:[^"]+]]"
// CHECK009-SAME: {{^}} "-internal-isystem" "[[RESOURCE]]/include"
diff --git a/clang/test/Driver/hexagon-vectorize.c b/clang/test/Driver/hexagon-vectorize.c
index 6a142e30cd949a0..9bf829440a18eee 100644
--- a/clang/test/Driver/hexagon-vectorize.c
+++ b/clang/test/Driver/hexagon-vectorize.c
@@ -1,9 +1,8 @@
-// RUN: %clang -target hexagon -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEFAULT
-// RUN: %clang -target hexagon -fvectorize -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-VECTOR
-// RUN: %clang -target hexagon -fvectorize -fno-vectorize -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-NOVECTOR
-// RUN: %clang -target hexagon -fvectorize -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-NEEDHVX
+// RUN: %clang --target=hexagon -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEFAULT
+// RUN: %clang --target=hexagon -fvectorize -### %s 2>&1 | FileCheck %s --check-prefixes=CHECK-NEEDHVX,CHECK-VECTOR
+// RUN: %clang --target=hexagon -fvectorize -fno-vectorize -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-NOVECTOR
// CHECK-DEFAULT-NOT: hexagon-autohvx
+// CHECK-NEEDHVX: warning: auto-vectorization requires HVX, use -mhvx/-mhvx= to enable it
// CHECK-VECTOR: "-mllvm" "-hexagon-autohvx"
// CHECK-NOVECTOR-NOT: hexagon-autohvx
-// CHECK-NEEDHVX: warning: auto-vectorization requires HVX, use -mhvx/-mhvx= to enable it
More information about the cfe-commits
mailing list