summaryrefslogtreecommitdiff
path: root/test/Driver
diff options
context:
space:
mode:
authorCoby Tayree <coby.tayree@intel.com>2017-12-27 09:22:34 +0000
committerCoby Tayree <coby.tayree@intel.com>2017-12-27 09:22:34 +0000
commit4086d83a7b37ebaf959bf235ae6ce154fc2d81cb (patch)
tree8923e26c174b518e4ab44e178d09ac6fdf7e01e1 /test/Driver
parent74bc9cb6f3a05063aa28e9950696725edaf331c7 (diff)
[hotfix]
fixinig test failures as seen here: http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/22791/steps/test/logs/stdio which resulted by rL321480 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@321482 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Driver')
-rw-r--r--test/Driver/x86-target-features.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/test/Driver/x86-target-features.c b/test/Driver/x86-target-features.c
index 0eb10e55c3..5fe3cd37f9 100644
--- a/test/Driver/x86-target-features.c
+++ b/test/Driver/x86-target-features.c
@@ -102,17 +102,11 @@
// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mgfni %s -### -o %t.o 2>&1 | FileCheck -check-prefix=GFNI %s
// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mno-gfni %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-GFNI %s
-<<<<<<<
// GFNI: "-target-feature" "+gfni"
// NO-GFNI: "-target-feature" "-gfni
-=======
-// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mno-clzero %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-CLZERO %s
-// CLZERO: "-target-feature" "+clzero"
-// NO-CLZERO: "-target-feature" "-clzero"
-
// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mvpclmulqdq %s -### -o %t.o 2>&1 | FileCheck -check-prefix=VPCLMULQDQ %s
// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mno-vpclmulqdq %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-VPCLMULQDQ %s
// VPCLMULQDQ: "-target-feature" "+vpclmulqdq"
// NO-VPCLMULQDQ: "-target-feature" "-vpclmulqdq"
->>>>>>>
+