[compiler-rt] r230997 - [DFSan] Remove explicit -m64 from RUN lines.

Alexey Samsonov vonosmas at gmail.com
Mon Mar 2 11:34:07 PST 2015


Author: samsonov
Date: Mon Mar  2 13:34:06 2015
New Revision: 230997

URL: http://llvm.org/viewvc/llvm-project?rev=230997&view=rev
Log:
[DFSan] Remove explicit -m64 from RUN lines.

Target-specific flags should usually be configured by CMake/lit.

Modified:
    compiler-rt/trunk/test/dfsan/basic.c
    compiler-rt/trunk/test/dfsan/custom.cc
    compiler-rt/trunk/test/dfsan/dump_labels.c
    compiler-rt/trunk/test/dfsan/flags.c
    compiler-rt/trunk/test/dfsan/fncall.c
    compiler-rt/trunk/test/dfsan/label_count.c
    compiler-rt/trunk/test/dfsan/lit.cfg
    compiler-rt/trunk/test/dfsan/propagate.c
    compiler-rt/trunk/test/dfsan/vararg.c
    compiler-rt/trunk/test/dfsan/write_callback.c

Modified: compiler-rt/trunk/test/dfsan/basic.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/basic.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/basic.c (original)
+++ compiler-rt/trunk/test/dfsan/basic.c Mon Mar  2 13:34:06 2015
@@ -1,5 +1,5 @@
-// RUN: %clang_dfsan -m64 %s -o %t && %run %t
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %s -o %t && %run %t
+// RUN: %clang_dfsan %s -o %t && %run %t
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi %s -o %t && %run %t
 
 // Tests that labels are propagated through loads and stores.
 

Modified: compiler-rt/trunk/test/dfsan/custom.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/custom.cc?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/custom.cc (original)
+++ compiler-rt/trunk/test/dfsan/custom.cc Mon Mar  2 13:34:06 2015
@@ -1,7 +1,7 @@
-// RUN: %clang_dfsan -m64 %s -o %t && DFSAN_OPTIONS="strict_data_dependencies=0" %run %t
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %s -o %t && DFSAN_OPTIONS="strict_data_dependencies=0" %run %t
-// RUN: %clang_dfsan -DSTRICT_DATA_DEPENDENCIES -m64 %s -o %t && %run %t
-// RUN: %clang_dfsan -DSTRICT_DATA_DEPENDENCIES -mllvm -dfsan-args-abi -m64 %s -o %t && %run %t
+// RUN: %clang_dfsan %s -o %t && DFSAN_OPTIONS="strict_data_dependencies=0" %run %t
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi %s -o %t && DFSAN_OPTIONS="strict_data_dependencies=0" %run %t
+// RUN: %clang_dfsan -DSTRICT_DATA_DEPENDENCIES %s -o %t && %run %t
+// RUN: %clang_dfsan -DSTRICT_DATA_DEPENDENCIES -mllvm -dfsan-args-abi %s -o %t && %run %t
 
 // Tests custom implementations of various glibc functions.
 

Modified: compiler-rt/trunk/test/dfsan/dump_labels.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/dump_labels.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/dump_labels.c (original)
+++ compiler-rt/trunk/test/dfsan/dump_labels.c Mon Mar  2 13:34:06 2015
@@ -1,4 +1,4 @@
-// RUN: %clang_dfsan -m64 %s -o %t
+// RUN: %clang_dfsan %s -o %t
 // RUN: DFSAN_OPTIONS=dump_labels_at_exit=/dev/stdout %run %t 2>&1 | FileCheck %s
 // RUN: DFSAN_OPTIONS=dump_labels_at_exit=/dev/stdout not %run %t c 2>&1 | FileCheck %s --check-prefix=CHECK-OOL
 // RUN: DFSAN_OPTIONS=dump_labels_at_exit=/dev/stdout not %run %t u 2>&1 | FileCheck %s --check-prefix=CHECK-OOL

Modified: compiler-rt/trunk/test/dfsan/flags.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/flags.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/flags.c (original)
+++ compiler-rt/trunk/test/dfsan/flags.c Mon Mar  2 13:34:06 2015
@@ -1,6 +1,6 @@
-// RUN: %clang_dfsan -m64 %s -fsanitize-blacklist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && %run %t 2>&1 | FileCheck %s
-// RUN: %clang_dfsan -m64 %s -fsanitize-blacklist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_unimplemented=0 %run %t 2>&1 | count 0
-// RUN: %clang_dfsan -m64 %s -fsanitize-blacklist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_nonzero_labels=1 %run %t 2>&1 | FileCheck --check-prefix=CHECK-NONZERO %s
+// RUN: %clang_dfsan %s -fsanitize-blacklist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_dfsan %s -fsanitize-blacklist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_unimplemented=0 %run %t 2>&1 | count 0
+// RUN: %clang_dfsan %s -fsanitize-blacklist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_nonzero_labels=1 %run %t 2>&1 | FileCheck --check-prefix=CHECK-NONZERO %s
 
 // Tests that flags work correctly.
 

Modified: compiler-rt/trunk/test/dfsan/fncall.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/fncall.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/fncall.c (original)
+++ compiler-rt/trunk/test/dfsan/fncall.c Mon Mar  2 13:34:06 2015
@@ -1,5 +1,5 @@
-// RUN: %clang_dfsan -m64 %s -o %t && %run %t
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %s -o %t && %run %t
+// RUN: %clang_dfsan %s -o %t && %run %t
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi %s -o %t && %run %t
 
 // Tests that labels are propagated through function calls.
 

Modified: compiler-rt/trunk/test/dfsan/label_count.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/label_count.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/label_count.c (original)
+++ compiler-rt/trunk/test/dfsan/label_count.c Mon Mar  2 13:34:06 2015
@@ -1,11 +1,11 @@
-// RUN: %clang_dfsan -DLIB -m64 -c %s -o %t.lib.o && \
-// RUN: %clang_dfsan       -m64 -c %s -o %t.o && \
-// RUN: %clang_dfsan -m64 %t.lib.o %t.o -o %t.bin && \
+// RUN: %clang_dfsan -DLIB -c %s -o %t.lib.o && \
+// RUN: %clang_dfsan       -c %s -o %t.o && \
+// RUN: %clang_dfsan %t.lib.o %t.o -o %t.bin && \
 // RUN: %run %t.bin
 
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 -DLIB -c %s -o %t.lib.o && \
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 -c %s -o %t.o && \
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %t.o %t.lib.o -o %t.bin && \
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi -DLIB -c %s -o %t.lib.o && \
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi -c %s -o %t.o && \
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi %t.o %t.lib.o -o %t.bin && \
 // RUN: %run %t.bin
 
 #include <sanitizer/dfsan_interface.h>

Modified: compiler-rt/trunk/test/dfsan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/lit.cfg?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/lit.cfg (original)
+++ compiler-rt/trunk/test/dfsan/lit.cfg Mon Mar  2 13:34:06 2015
@@ -9,7 +9,7 @@ config.name = 'DataFlowSanitizer'
 config.test_source_root = os.path.dirname(__file__)
 
 # Setup default compiler flags used with -fsanitize=dataflow option.
-clang_dfsan_cflags = ["-fsanitize=dataflow"]
+clang_dfsan_cflags = ["-fsanitize=dataflow", "-m64"]
 clang_dfsan_cxxflags = config.cxx_mode_flags + clang_dfsan_cflags
 
 def build_invocation(compile_flags):

Modified: compiler-rt/trunk/test/dfsan/propagate.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/propagate.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/propagate.c (original)
+++ compiler-rt/trunk/test/dfsan/propagate.c Mon Mar  2 13:34:06 2015
@@ -1,5 +1,5 @@
-// RUN: %clang_dfsan -m64 %s -o %t && %run %t
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %s -o %t && %run %t
+// RUN: %clang_dfsan %s -o %t && %run %t
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi %s -o %t && %run %t
 
 // Tests that labels are propagated through computation and that union labels
 // are properly created.

Modified: compiler-rt/trunk/test/dfsan/vararg.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/vararg.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/vararg.c (original)
+++ compiler-rt/trunk/test/dfsan/vararg.c Mon Mar  2 13:34:06 2015
@@ -1,7 +1,7 @@
-// RUN: %clang_dfsan -m64 %s -o %t
+// RUN: %clang_dfsan %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 // RUN: %run %t foo
-// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %s -o %t
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 // RUN: %run %t foo
 

Modified: compiler-rt/trunk/test/dfsan/write_callback.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/write_callback.c?rev=230997&r1=230996&r2=230997&view=diff
==============================================================================
--- compiler-rt/trunk/test/dfsan/write_callback.c (original)
+++ compiler-rt/trunk/test/dfsan/write_callback.c Mon Mar  2 13:34:06 2015
@@ -1,5 +1,5 @@
-// RUN: %clang_dfsan                         -m64 %s -o %t && %run %t | FileCheck %s
-// RUN: %clang_dfsan  -mllvm -dfsan-args-abi -m64 %s -o %t && %run %t | FileCheck %s
+// RUN: %clang_dfsan                         %s -o %t && %run %t | FileCheck %s
+// RUN: %clang_dfsan  -mllvm -dfsan-args-abi %s -o %t && %run %t | FileCheck %s
 
 // Tests that the custom implementation of write() does writes with or without
 // a callback set using dfsan_set_write_callback().





More information about the llvm-commits mailing list