[compiler-rt] r230999 - [MSan] Remove explicit -m64 from RUN lines.

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


Author: samsonov
Date: Mon Mar  2 13:34:27 2015
New Revision: 230999

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

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

Modified:
    compiler-rt/trunk/test/msan/Linux/getresid.cc
    compiler-rt/trunk/test/msan/Linux/glob.cc
    compiler-rt/trunk/test/msan/Linux/glob_altdirfunc.cc
    compiler-rt/trunk/test/msan/Linux/glob_nomatch.cc
    compiler-rt/trunk/test/msan/Linux/sunrpc.cc
    compiler-rt/trunk/test/msan/Linux/sunrpc_bytes.cc
    compiler-rt/trunk/test/msan/Linux/sunrpc_string.cc
    compiler-rt/trunk/test/msan/Linux/syscalls.cc
    compiler-rt/trunk/test/msan/Linux/tcgetattr.cc
    compiler-rt/trunk/test/msan/Linux/xattr.cc
    compiler-rt/trunk/test/msan/backtrace.cc
    compiler-rt/trunk/test/msan/c-strdup.c
    compiler-rt/trunk/test/msan/chained_origin.cc
    compiler-rt/trunk/test/msan/chained_origin_empty_stack.cc
    compiler-rt/trunk/test/msan/chained_origin_limits.cc
    compiler-rt/trunk/test/msan/chained_origin_memcpy.cc
    compiler-rt/trunk/test/msan/chained_origin_with_signals.cc
    compiler-rt/trunk/test/msan/check_mem_is_initialized.cc
    compiler-rt/trunk/test/msan/cxa_atexit.cc
    compiler-rt/trunk/test/msan/death-callback.cc
    compiler-rt/trunk/test/msan/dlerror.cc
    compiler-rt/trunk/test/msan/dso-origin.cc
    compiler-rt/trunk/test/msan/dtls_test.c
    compiler-rt/trunk/test/msan/errno.cc
    compiler-rt/trunk/test/msan/fork.cc
    compiler-rt/trunk/test/msan/ftime.cc
    compiler-rt/trunk/test/msan/getaddrinfo-positive.cc
    compiler-rt/trunk/test/msan/getaddrinfo.cc
    compiler-rt/trunk/test/msan/getc_unlocked.c
    compiler-rt/trunk/test/msan/heap-origin.cc
    compiler-rt/trunk/test/msan/iconv.cc
    compiler-rt/trunk/test/msan/if_indextoname.cc
    compiler-rt/trunk/test/msan/ifaddrs.cc
    compiler-rt/trunk/test/msan/initgroups.cc
    compiler-rt/trunk/test/msan/insertvalue_origin.cc
    compiler-rt/trunk/test/msan/ioctl.cc
    compiler-rt/trunk/test/msan/ioctl_custom.cc
    compiler-rt/trunk/test/msan/ioctl_sound.cc
    compiler-rt/trunk/test/msan/keep-going-dso.cc
    compiler-rt/trunk/test/msan/keep-going.cc
    compiler-rt/trunk/test/msan/mallinfo.cc
    compiler-rt/trunk/test/msan/mktime.cc
    compiler-rt/trunk/test/msan/mmap_below_shadow.cc
    compiler-rt/trunk/test/msan/msan_check_mem_is_initialized.cc
    compiler-rt/trunk/test/msan/msan_dump_shadow.cc
    compiler-rt/trunk/test/msan/msan_print_shadow.cc
    compiler-rt/trunk/test/msan/msan_print_shadow2.cc
    compiler-rt/trunk/test/msan/msan_print_shadow3.cc
    compiler-rt/trunk/test/msan/mul_by_const.cc
    compiler-rt/trunk/test/msan/no_sanitize_memory.cc
    compiler-rt/trunk/test/msan/no_sanitize_memory_prop.cc
    compiler-rt/trunk/test/msan/obstack.cc
    compiler-rt/trunk/test/msan/origin-store-long.cc
    compiler-rt/trunk/test/msan/param_tls_limit.cc
    compiler-rt/trunk/test/msan/print_stats.cc
    compiler-rt/trunk/test/msan/pthread_getattr_np_deadlock.cc
    compiler-rt/trunk/test/msan/rand_r.cc
    compiler-rt/trunk/test/msan/readdir64.cc
    compiler-rt/trunk/test/msan/realloc-large-origin.cc
    compiler-rt/trunk/test/msan/realloc-origin.cc
    compiler-rt/trunk/test/msan/report-demangling.cc
    compiler-rt/trunk/test/msan/scandir.cc
    compiler-rt/trunk/test/msan/scandir_null.cc
    compiler-rt/trunk/test/msan/select.cc
    compiler-rt/trunk/test/msan/setlocale.cc
    compiler-rt/trunk/test/msan/stack-origin.cc
    compiler-rt/trunk/test/msan/stack-origin2.cc
    compiler-rt/trunk/test/msan/strlen_of_shadow.cc
    compiler-rt/trunk/test/msan/strxfrm.cc
    compiler-rt/trunk/test/msan/sync_lock_set_and_test.cc
    compiler-rt/trunk/test/msan/textdomain.cc
    compiler-rt/trunk/test/msan/times.cc
    compiler-rt/trunk/test/msan/tls_reuse.cc
    compiler-rt/trunk/test/msan/tzset.cc
    compiler-rt/trunk/test/msan/unaligned_read_origin.cc
    compiler-rt/trunk/test/msan/unpoison_string.cc
    compiler-rt/trunk/test/msan/use-after-free.cc
    compiler-rt/trunk/test/msan/vector_cvt.cc
    compiler-rt/trunk/test/msan/vector_select.cc

Modified: compiler-rt/trunk/test/msan/Linux/getresid.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/getresid.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/getresid.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/getresid.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p 2>&1
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p 2>&1
 
 #include <assert.h>
 #include <unistd.h>

Modified: compiler-rt/trunk/test/msan/Linux/glob.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/glob.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/glob.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/glob.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <glob.h>

Modified: compiler-rt/trunk/test/msan/Linux/glob_altdirfunc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/glob_altdirfunc.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/glob_altdirfunc.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/glob_altdirfunc.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <glob.h>

Modified: compiler-rt/trunk/test/msan/Linux/glob_nomatch.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/glob_nomatch.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/glob_nomatch.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/glob_nomatch.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p
 
 #include <assert.h>
 #include <glob.h>

Modified: compiler-rt/trunk/test/msan/Linux/sunrpc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/sunrpc.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/sunrpc.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/sunrpc.cc Mon Mar  2 13:34:27 2015
@@ -1,14 +1,14 @@
-// RUN: %clangxx_msan -m64 -g -O0 -DTYPE=int -DFN=xdr_int %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DTYPE=int -DFN=xdr_int %s -o %t && \
 // RUN:     %run %t 2>&1
-// RUN: %clangxx_msan -m64 -g -O0 -DTYPE=int -DFN=xdr_int -DUNINIT=1 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DTYPE=int -DFN=xdr_int -DUNINIT=1 %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -m64 -g -O0 -DTYPE=double -DFN=xdr_double %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DTYPE=double -DFN=xdr_double %s -o %t && \
 // RUN:     %run %t 2>&1
-// RUN: %clangxx_msan -m64 -g -O0 -DTYPE=double -DFN=xdr_double -DUNINIT=1 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DTYPE=double -DFN=xdr_double -DUNINIT=1 %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -m64 -g -O0 -DTYPE=u_quad_t -DFN=xdr_u_longlong_t %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DTYPE=u_quad_t -DFN=xdr_u_longlong_t %s -o %t && \
 // RUN:     %run %t 2>&1
-// RUN: %clangxx_msan -m64 -g -O0 -DTYPE=u_quad_t -DFN=xdr_u_longlong_t -DUNINIT=1 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DTYPE=u_quad_t -DFN=xdr_u_longlong_t -DUNINIT=1 %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>

Modified: compiler-rt/trunk/test/msan/Linux/sunrpc_bytes.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/sunrpc_bytes.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/sunrpc_bytes.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/sunrpc_bytes.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -g -O0 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 %s -o %t && \
 // RUN:     %run %t 2>&1
-// RUN: %clangxx_msan -m64 -g -O0 -DUNINIT=1 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DUNINIT=1 %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>

Modified: compiler-rt/trunk/test/msan/Linux/sunrpc_string.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/sunrpc_string.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/sunrpc_string.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/sunrpc_string.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -g -O0 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 %s -o %t && \
 // RUN:     %run %t 2>&1
-// RUN: %clangxx_msan -m64 -g -O0 -DUNINIT=1 %s -o %t && \
+// RUN: %clangxx_msan -g -O0 -DUNINIT=1 %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>

Modified: compiler-rt/trunk/test/msan/Linux/syscalls.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/syscalls.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/syscalls.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/syscalls.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t 2>&1
 
 #include <assert.h>
 #include <errno.h>

Modified: compiler-rt/trunk/test/msan/Linux/tcgetattr.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/tcgetattr.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/tcgetattr.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/tcgetattr.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p
 
 #include <assert.h>
 #include <glob.h>

Modified: compiler-rt/trunk/test/msan/Linux/xattr.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/xattr.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/xattr.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/xattr.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p 2>&1
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p 2>&1
 
 #include <argz.h>
 #include <assert.h>

Modified: compiler-rt/trunk/test/msan/backtrace.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/backtrace.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/backtrace.cc (original)
+++ compiler-rt/trunk/test/msan/backtrace.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <assert.h>
 #include <execinfo.h>

Modified: compiler-rt/trunk/test/msan/c-strdup.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/c-strdup.c?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/c-strdup.c (original)
+++ compiler-rt/trunk/test/msan/c-strdup.c Mon Mar  2 13:34:27 2015
@@ -1,7 +1,7 @@
-// RUN: %clang_msan -m64 -O0 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clang_msan -m64 -O1 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clang_msan -m64 -O2 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clang_msan -m64 -O3 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clang_msan -O0 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clang_msan -O1 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clang_msan -O2 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clang_msan -O3 %s -o %t && %run %t >%t.out 2>&1
 
 // Test that strdup in C programs is intercepted.
 // GLibC headers translate strdup to __strdup at -O1 and higher.

Modified: compiler-rt/trunk/test/msan/chained_origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/chained_origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/chained_origin.cc (original)
+++ compiler-rt/trunk/test/msan/chained_origin.cc Mon Mar  2 13:34:27 2015
@@ -1,17 +1,17 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-STACK < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DHEAP=1 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DHEAP=1 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-HEAP < %t.out
 
 
-// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-STACK < %t.out
 
-// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DHEAP=1 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DHEAP=1 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-HEAP < %t.out
 

Modified: compiler-rt/trunk/test/msan/chained_origin_empty_stack.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/chained_origin_empty_stack.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/chained_origin_empty_stack.cc (original)
+++ compiler-rt/trunk/test/msan/chained_origin_empty_stack.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
 // RUN:     MSAN_OPTIONS=store_context_size=1 not %run %t 2>&1 | FileCheck %s
 
 // Test that stack trace for the intermediate store is not empty.

Modified: compiler-rt/trunk/test/msan/chained_origin_limits.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/chained_origin_limits.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/chained_origin_limits.cc (original)
+++ compiler-rt/trunk/test/msan/chained_origin_limits.cc Mon Mar  2 13:34:27 2015
@@ -1,7 +1,7 @@
 // This test program creates a very large number of unique histories.
 
 // Heap origin.
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O3 %s -o %t
 
 // RUN: MSAN_OPTIONS=origin_history_size=7 not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK7 < %t.out
@@ -16,7 +16,7 @@
 // RUN: FileCheck %s --check-prefix=CHECK7 < %t.out
 
 // Stack origin.
-// RUN: %clangxx_msan -DSTACK -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t
+// RUN: %clangxx_msan -DSTACK -fsanitize-memory-track-origins=2 -O3 %s -o %t
 
 // RUN: MSAN_OPTIONS=origin_history_size=7 not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK7 < %t.out
@@ -32,7 +32,7 @@
 
 
 // Heap origin, with calls.
-// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t
+// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -O3 %s -o %t
 
 // RUN: MSAN_OPTIONS=origin_history_size=7 not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK7 < %t.out
@@ -48,7 +48,7 @@
 
 
 // Stack origin, with calls.
-// RUN: %clangxx_msan -DSTACK -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t
+// RUN: %clangxx_msan -DSTACK -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -O3 %s -o %t
 
 // RUN: MSAN_OPTIONS=origin_history_size=7 not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK7 < %t.out

Modified: compiler-rt/trunk/test/msan/chained_origin_memcpy.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/chained_origin_memcpy.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/chained_origin_memcpy.cc (original)
+++ compiler-rt/trunk/test/msan/chained_origin_memcpy.cc Mon Mar  2 13:34:27 2015
@@ -1,17 +1,17 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -DOFFSET=0 -O3 %s -o %t && \
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=0 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z1 < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=10 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=10 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z2 < %t.out
 
 
-// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -m64 -DOFFSET=0 -O3 %s -o %t && \
+// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=0 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z1 < %t.out
 
-// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=10 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=10 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z2 < %t.out
 

Modified: compiler-rt/trunk/test/msan/chained_origin_with_signals.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/chained_origin_with_signals.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/chained_origin_with_signals.cc (original)
+++ compiler-rt/trunk/test/msan/chained_origin_with_signals.cc Mon Mar  2 13:34:27 2015
@@ -2,11 +2,11 @@
 // This is, in fact, undesired behavior caused by our chained origins
 // implementation being not async-signal-safe.
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -m64 -O3 %s -o %t && \
+// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
 // RUN:     not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 

Modified: compiler-rt/trunk/test/msan/check_mem_is_initialized.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/check_mem_is_initialized.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/check_mem_is_initialized.cc (original)
+++ compiler-rt/trunk/test/msan/check_mem_is_initialized.cc Mon Mar  2 13:34:27 2015
@@ -1,19 +1,19 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/cxa_atexit.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/cxa_atexit.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/cxa_atexit.cc (original)
+++ compiler-rt/trunk/test/msan/cxa_atexit.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p
 
 // PR17377: C++ module destructors get stale argument shadow.
 

Modified: compiler-rt/trunk/test/msan/death-callback.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/death-callback.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/death-callback.cc (original)
+++ compiler-rt/trunk/test/msan/death-callback.cc Mon Mar  2 13:34:27 2015
@@ -1,10 +1,10 @@
-// RUN: %clangxx_msan -m64 -DERROR %s -o %t && not %run %t 2>&1 | \
+// RUN: %clangxx_msan -DERROR %s -o %t && not %run %t 2>&1 | \
 // RUN:     FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NOCB
-// RUN: %clangxx_msan -m64 -DERROR -DMSANCB_SET %s -o %t && not %run %t 2>&1 | \
+// RUN: %clangxx_msan -DERROR -DMSANCB_SET %s -o %t && not %run %t 2>&1 | \
 // RUN:     FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-CB
-// RUN: %clangxx_msan -m64 -DERROR -DMSANCB_SET -DMSANCB_CLEAR %s -o %t && not %run %t 2>&1 | \
+// RUN: %clangxx_msan -DERROR -DMSANCB_SET -DMSANCB_CLEAR %s -o %t && not %run %t 2>&1 | \
 // RUN:     FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NOCB
-// RUN: %clangxx_msan -m64 -DMSANCB_SET %s -o %t && %run %t 2>&1 | \
+// RUN: %clangxx_msan -DMSANCB_SET %s -o %t && %run %t 2>&1 | \
 // RUN:     FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NOCB
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/dlerror.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/dlerror.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/dlerror.cc (original)
+++ compiler-rt/trunk/test/msan/dlerror.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <assert.h>
 #include <dlfcn.h>

Modified: compiler-rt/trunk/test/msan/dso-origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/dso-origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/dso-origin.cc (original)
+++ compiler-rt/trunk/test/msan/dso-origin.cc Mon Mar  2 13:34:27 2015
@@ -1,7 +1,7 @@
 // Build a library with origin tracking and an executable w/o origin tracking.
 // Test that origin tracking is enabled at runtime.
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -DBUILD_SO -fPIC -shared -o %t-so.so
-// RUN: %clangxx_msan -m64 -O0 %s %t-so.so -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -DBUILD_SO -fPIC -shared -o %t-so.so
+// RUN: %clangxx_msan -O0 %s %t-so.so -o %t && not %run %t 2>&1 | FileCheck %s
 
 #ifdef BUILD_SO
 

Modified: compiler-rt/trunk/test/msan/dtls_test.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/dtls_test.c?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/dtls_test.c (original)
+++ compiler-rt/trunk/test/msan/dtls_test.c Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-/* RUN: %clang_msan -g -m64 %s -o %t
-   RUN: %clang_msan -g -m64 %s -DBUILD_SO -fPIC -o %t-so.so -shared
+/* RUN: %clang_msan -g %s -o %t
+   RUN: %clang_msan -g %s -DBUILD_SO -fPIC -o %t-so.so -shared
    RUN: %run %t 2>&1
 
    Regression test for a bug in msan/glibc integration,

Modified: compiler-rt/trunk/test/msan/errno.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/errno.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/errno.cc (original)
+++ compiler-rt/trunk/test/msan/errno.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <assert.h>
 #include <errno.h>

Modified: compiler-rt/trunk/test/msan/fork.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/fork.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/fork.cc (original)
+++ compiler-rt/trunk/test/msan/fork.cc Mon Mar  2 13:34:27 2015
@@ -2,7 +2,7 @@
 // Run a number of threads that create new chained origins, then fork
 // and verify that origin reads do not deadlock in the child process.
 
-// RUN: %clangxx_msan -std=c++11 -fsanitize-memory-track-origins=2 -g -m64 -O3 %s -o %t
+// RUN: %clangxx_msan -std=c++11 -fsanitize-memory-track-origins=2 -g -O3 %s -o %t
 // RUN: MSAN_OPTIONS=store_context_size=1000,origin_history_size=0,origin_history_per_stack_limit=0 %run %t |& FileCheck %s
 
 // Fun fact: if test output is redirected to a file (as opposed to

Modified: compiler-rt/trunk/test/msan/ftime.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/ftime.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/ftime.cc (original)
+++ compiler-rt/trunk/test/msan/ftime.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <sys/timeb.h>

Modified: compiler-rt/trunk/test/msan/getaddrinfo-positive.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/getaddrinfo-positive.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/getaddrinfo-positive.cc (original)
+++ compiler-rt/trunk/test/msan/getaddrinfo-positive.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
 #include <sys/types.h>

Modified: compiler-rt/trunk/test/msan/getaddrinfo.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/getaddrinfo.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/getaddrinfo.cc (original)
+++ compiler-rt/trunk/test/msan/getaddrinfo.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <sys/types.h>
 #include <sys/socket.h>

Modified: compiler-rt/trunk/test/msan/getc_unlocked.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/getc_unlocked.c?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/getc_unlocked.c (original)
+++ compiler-rt/trunk/test/msan/getc_unlocked.c Mon Mar  2 13:34:27 2015
@@ -1,12 +1,12 @@
-// RUN: %clangxx_msan -DGETC -m64 -O0 -g -xc++ %s -o %t && %run %t
-// RUN: %clangxx_msan -DGETC -m64 -O3 -g -xc++ %s -o %t && %run %t
-// RUN: %clang_msan -DGETC -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clang_msan -DGETC -m64 -O3 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -DGETC -O0 -g -xc++ %s -o %t && %run %t
+// RUN: %clangxx_msan -DGETC -O3 -g -xc++ %s -o %t && %run %t
+// RUN: %clang_msan -DGETC -O0 -g %s -o %t && %run %t
+// RUN: %clang_msan -DGETC -O3 -g %s -o %t && %run %t
 
-// RUN: %clangxx_msan -DGETCHAR -m64 -O0 -g -xc++ %s -o %t && %run %t
-// RUN: %clangxx_msan -DGETCHAR -m64 -O3 -g -xc++ %s -o %t && %run %t
-// RUN: %clang_msan -DGETCHAR -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clang_msan -DGETCHAR -m64 -O3 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -DGETCHAR -O0 -g -xc++ %s -o %t && %run %t
+// RUN: %clangxx_msan -DGETCHAR -O3 -g -xc++ %s -o %t && %run %t
+// RUN: %clang_msan -DGETCHAR -O0 -g %s -o %t && %run %t
+// RUN: %clang_msan -DGETCHAR -O3 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/test/msan/heap-origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/heap-origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/heap-origin.cc (original)
+++ compiler-rt/trunk/test/msan/heap-origin.cc Mon Mar  2 13:34:27 2015
@@ -1,19 +1,19 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/iconv.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/iconv.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/iconv.cc (original)
+++ compiler-rt/trunk/test/msan/iconv.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -g -DPOSITIVE %s -o %t && not %run %t |& FileCheck %s
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t && not %run %t |& FileCheck %s
 
 #include <assert.h>
 #include <iconv.h>

Modified: compiler-rt/trunk/test/msan/if_indextoname.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/if_indextoname.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/if_indextoname.cc (original)
+++ compiler-rt/trunk/test/msan/if_indextoname.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t 2>&1
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t 2>&1
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t 2>&1
 
 #include <assert.h>
 #include <errno.h>

Modified: compiler-rt/trunk/test/msan/ifaddrs.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/ifaddrs.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/ifaddrs.cc (original)
+++ compiler-rt/trunk/test/msan/ifaddrs.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p 2>&1
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p 2>&1
 
 #include <assert.h>
 #include <errno.h>

Modified: compiler-rt/trunk/test/msan/initgroups.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/initgroups.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/initgroups.cc (original)
+++ compiler-rt/trunk/test/msan/initgroups.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <sys/types.h>
 #include <grp.h>

Modified: compiler-rt/trunk/test/msan/insertvalue_origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/insertvalue_origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/insertvalue_origin.cc (original)
+++ compiler-rt/trunk/test/msan/insertvalue_origin.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
 
 // Test origin propagation through insertvalue IR instruction.

Modified: compiler-rt/trunk/test/msan/ioctl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/ioctl.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/ioctl.cc (original)
+++ compiler-rt/trunk/test/msan/ioctl.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O3 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O3 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/ioctl_custom.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/ioctl_custom.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/ioctl_custom.cc (original)
+++ compiler-rt/trunk/test/msan/ioctl_custom.cc Mon Mar  2 13:34:27 2015
@@ -1,8 +1,8 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O3 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O3 -g %s -o %t && %run %t
 
-// RUN: %clangxx_msan -DPOSITIVE -m64 -O0 -g %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -DPOSITIVE -m64 -O3 -g %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -DPOSITIVE -O0 -g %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -DPOSITIVE -O3 -g %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/ioctl_sound.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/ioctl_sound.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/ioctl_sound.cc (original)
+++ compiler-rt/trunk/test/msan/ioctl_sound.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O3 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O3 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <fcntl.h>

Modified: compiler-rt/trunk/test/msan/keep-going-dso.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/keep-going-dso.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/keep-going-dso.cc (original)
+++ compiler-rt/trunk/test/msan/keep-going-dso.cc Mon Mar  2 13:34:27 2015
@@ -1,15 +1,15 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
 
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
 
 // Test how -mllvm -msan-keep-going and MSAN_OPTIONS=keep_going affect reports

Modified: compiler-rt/trunk/test/msan/keep-going.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/keep-going.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/keep-going.cc (original)
+++ compiler-rt/trunk/test/msan/keep-going.cc Mon Mar  2 13:34:27 2015
@@ -1,19 +1,19 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
 
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=0 not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=keep_going=1 not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=halt_on_error=1 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=halt_on_error=1 not %run %t >%t.out 2>&1
 // FileCheck %s <%t.out
-// RUN: %clangxx_msan -m64 -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=halt_on_error=0 not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -mllvm -msan-keep-going=1 -O0 %s -o %t && MSAN_OPTIONS=halt_on_error=0 not %run %t >%t.out 2>&1
 // FileCheck --check-prefix=CHECK-KEEP-GOING %s <%t.out
 
 // Test behaviour of -mllvm -msan-keep-going and MSAN_OPTIONS=keep_going.

Modified: compiler-rt/trunk/test/msan/mallinfo.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/mallinfo.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/mallinfo.cc (original)
+++ compiler-rt/trunk/test/msan/mallinfo.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <malloc.h>

Modified: compiler-rt/trunk/test/msan/mktime.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/mktime.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/mktime.cc (original)
+++ compiler-rt/trunk/test/msan/mktime.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -g -DUNINIT %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g -DUNINIT %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <time.h>

Modified: compiler-rt/trunk/test/msan/mmap_below_shadow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/mmap_below_shadow.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/mmap_below_shadow.cc (original)
+++ compiler-rt/trunk/test/msan/mmap_below_shadow.cc Mon Mar  2 13:34:27 2015
@@ -3,10 +3,10 @@
 // Without MAP_FIXED, we ignore the address hint and map somewhere in
 // application range.
 
-// RUN: %clangxx_msan -m64 -O0 -DFIXED=0 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -DFIXED=1 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -DFIXED=0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -DFIXED=1 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -DFIXED=0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -DFIXED=1 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -DFIXED=0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -DFIXED=1 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
 
 #include <assert.h>
 #include <errno.h>

Modified: compiler-rt/trunk/test/msan/msan_check_mem_is_initialized.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/msan_check_mem_is_initialized.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/msan_check_mem_is_initialized.cc (original)
+++ compiler-rt/trunk/test/msan/msan_check_mem_is_initialized.cc Mon Mar  2 13:34:27 2015
@@ -1,9 +1,9 @@
-// RUN: %clangxx_msan -m64 -O0 -g -DPOSITIVE %s -o %t
+// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK
 // RUN: MSAN_OPTIONS=verbosity=1 not %run %t 2>&1 | \
 // RUN:     FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-VERBOSE
 
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 #include <sanitizer/msan_interface.h>
 

Modified: compiler-rt/trunk/test/msan/msan_dump_shadow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/msan_dump_shadow.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/msan_dump_shadow.cc (original)
+++ compiler-rt/trunk/test/msan/msan_dump_shadow.cc Mon Mar  2 13:34:27 2015
@@ -1,10 +1,10 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/msan_print_shadow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/msan_print_shadow.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/msan_print_shadow.cc (original)
+++ compiler-rt/trunk/test/msan/msan_print_shadow.cc Mon Mar  2 13:34:27 2015
@@ -1,10 +1,10 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NO-ORIGINS < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-ORIGINS < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-ORIGINS --check-prefix=CHECK-ORIGINS-2 < %t.out
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/msan_print_shadow2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/msan_print_shadow2.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/msan_print_shadow2.cc (original)
+++ compiler-rt/trunk/test/msan/msan_print_shadow2.cc Mon Mar  2 13:34:27 2015
@@ -1,10 +1,10 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NO-ORIGINS < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-ORIGINS < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-ORIGINS < %t.out
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/msan_print_shadow3.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/msan_print_shadow3.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/msan_print_shadow3.cc (original)
+++ compiler-rt/trunk/test/msan/msan_print_shadow3.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
 #include <stdint.h>

Modified: compiler-rt/trunk/test/msan/mul_by_const.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/mul_by_const.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/mul_by_const.cc (original)
+++ compiler-rt/trunk/test/msan/mul_by_const.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && %run %t
+// RUN: %clangxx_msan -O2 %s -o %t && %run %t
 
 #include <sanitizer/msan_interface.h>
 

Modified: compiler-rt/trunk/test/msan/no_sanitize_memory.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/no_sanitize_memory.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/no_sanitize_memory.cc (original)
+++ compiler-rt/trunk/test/msan/no_sanitize_memory.cc Mon Mar  2 13:34:27 2015
@@ -1,12 +1,12 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t >%t.out 2>&1
 
-// RUN: %clangxx_msan -m64 -O0 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O1 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O2 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t -DCHECK_IN_F && %run %t >%t.out 2>&1
 
 // Test that (no_sanitize_memory) functions
 // * don't check shadow values (-DCHECK_IN_F)

Modified: compiler-rt/trunk/test/msan/no_sanitize_memory_prop.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/no_sanitize_memory_prop.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/no_sanitize_memory_prop.cc (original)
+++ compiler-rt/trunk/test/msan/no_sanitize_memory_prop.cc Mon Mar  2 13:34:27 2015
@@ -1,7 +1,7 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && %run %t >%t.out 2>&1
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t >%t.out 2>&1
 
 // Test that (no_sanitize_memory) functions DO NOT propagate shadow.
 

Modified: compiler-rt/trunk/test/msan/obstack.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/obstack.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/obstack.cc (original)
+++ compiler-rt/trunk/test/msan/obstack.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -g -DPOSITIVE %s -o %t && not %run %t |& FileCheck %s
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t && not %run %t |& FileCheck %s
 
 #include <obstack.h>
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/origin-store-long.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/origin-store-long.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/origin-store-long.cc (original)
+++ compiler-rt/trunk/test/msan/origin-store-long.cc Mon Mar  2 13:34:27 2015
@@ -1,7 +1,7 @@
 // Check that 8-byte store updates origin for the full store range.
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/param_tls_limit.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/param_tls_limit.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/param_tls_limit.cc (original)
+++ compiler-rt/trunk/test/msan/param_tls_limit.cc Mon Mar  2 13:34:27 2015
@@ -1,9 +1,9 @@
 // ParamTLS has limited size. Everything that does not fit is considered fully
 // initialized.
 
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && %run %t
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O0 %s -o %t && %run %t
 
 #include <sanitizer/msan_interface.h>
 #include <assert.h>

Modified: compiler-rt/trunk/test/msan/print_stats.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/print_stats.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/print_stats.cc (original)
+++ compiler-rt/trunk/test/msan/print_stats.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -g %s -o %t 
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -g %s -o %t 
 // RUN: %run %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK --check-prefix=CHECK-NOSTATS %s
 // RUN: MSAN_OPTIONS=print_stats=1 %run %t 2>&1 | \
@@ -6,13 +6,13 @@
 // RUN: MSAN_OPTIONS=print_stats=1,atexit=1 %run %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK --check-prefix=CHECK-STATS %s
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -g -DPOSITIVE=1 %s -o %t 
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -g -DPOSITIVE=1 %s -o %t 
 // RUN: not %run %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK --check-prefix=CHECK-NOSTATS %s
 // RUN: MSAN_OPTIONS=print_stats=1 not %run %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK --check-prefix=CHECK-STATS %s
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -g -DPOSITIVE=1 -mllvm -msan-keep-going=1 %s -o %t 
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -g -DPOSITIVE=1 -mllvm -msan-keep-going=1 %s -o %t 
 // RUN: not %run %t 2>&1 | \
 // RUN:  FileCheck --check-prefix=CHECK --check-prefix=CHECK-NOSTATS --check-prefix=CHECK-KEEPGOING %s
 // RUN: MSAN_OPTIONS=print_stats=1 not %run %t 2>&1 | \

Modified: compiler-rt/trunk/test/msan/pthread_getattr_np_deadlock.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/pthread_getattr_np_deadlock.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/pthread_getattr_np_deadlock.cc (original)
+++ compiler-rt/trunk/test/msan/pthread_getattr_np_deadlock.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -fsanitize-memory-track-origins -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && %run %t
 
 // Regression test for a deadlock in pthread_getattr_np
 

Modified: compiler-rt/trunk/test/msan/rand_r.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/rand_r.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/rand_r.cc (original)
+++ compiler-rt/trunk/test/msan/rand_r.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O0 -g -DUNINIT %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g -DUNINIT %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/test/msan/readdir64.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/readdir64.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/readdir64.cc (original)
+++ compiler-rt/trunk/test/msan/readdir64.cc Mon Mar  2 13:34:27 2015
@@ -1,12 +1,12 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O1 %s -o %t && %run %t
+// RUN: %clangxx_msan -O2 %s -o %t && %run %t
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t
 
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O1 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O2 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
-// RUN: %clangxx_msan -m64 -O3 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
+// RUN: %clangxx_msan -O1 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
+// RUN: %clangxx_msan -O2 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
+// RUN: %clangxx_msan -O3 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t
 
 // Test that readdir64 is intercepted as well as readdir.
 

Modified: compiler-rt/trunk/test/msan/realloc-large-origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/realloc-large-origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/realloc-large-origin.cc (original)
+++ compiler-rt/trunk/test/msan/realloc-large-origin.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
 // This is a regression test: there used to be broken "stored to memory at"

Modified: compiler-rt/trunk/test/msan/realloc-origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/realloc-origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/realloc-origin.cc (original)
+++ compiler-rt/trunk/test/msan/realloc-origin.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
 // This test relies on realloc from 100 to 101 being done in-place.

Modified: compiler-rt/trunk/test/msan/report-demangling.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/report-demangling.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/report-demangling.cc (original)
+++ compiler-rt/trunk/test/msan/report-demangling.cc Mon Mar  2 13:34:27 2015
@@ -1,7 +1,7 @@
 // Test that function name is mangled in the "created by an allocation" line,
 // and demangled in the single-frame "stack trace" that follows.
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
 
 __attribute__((noinline))

Modified: compiler-rt/trunk/test/msan/scandir.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/scandir.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/scandir.cc (original)
+++ compiler-rt/trunk/test/msan/scandir.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p
 
 #include <assert.h>
 #include <glob.h>

Modified: compiler-rt/trunk/test/msan/scandir_null.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/scandir_null.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/scandir_null.cc (original)
+++ compiler-rt/trunk/test/msan/scandir_null.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t %p
-// RUN: %clangxx_msan -m64 -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O0 -D_FILE_OFFSET_BITS=64 %s -o %t && %run %t %p
+// RUN: %clangxx_msan -O3 %s -o %t && %run %t %p
 
 #include <assert.h>
 #include <glob.h>

Modified: compiler-rt/trunk/test/msan/select.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/select.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/select.cc (original)
+++ compiler-rt/trunk/test/msan/select.cc Mon Mar  2 13:34:27 2015
@@ -1,10 +1,10 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/setlocale.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/setlocale.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/setlocale.cc (original)
+++ compiler-rt/trunk/test/msan/setlocale.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <assert.h>
 #include <locale.h>

Modified: compiler-rt/trunk/test/msan/stack-origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/stack-origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/stack-origin.cc (original)
+++ compiler-rt/trunk/test/msan/stack-origin.cc Mon Mar  2 13:34:27 2015
@@ -1,19 +1,19 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/stack-origin2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/stack-origin2.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/stack-origin2.cc (original)
+++ compiler-rt/trunk/test/msan/stack-origin2.cc Mon Mar  2 13:34:27 2015
@@ -1,21 +1,21 @@
 // Test that on the second entry to a function the origins are still right.
 
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/strlen_of_shadow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/strlen_of_shadow.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/strlen_of_shadow.cc (original)
+++ compiler-rt/trunk/test/msan/strlen_of_shadow.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 // Check that strlen() and similar intercepted functions can be called on shadow
 // memory.

Modified: compiler-rt/trunk/test/msan/strxfrm.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/strxfrm.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/strxfrm.cc (original)
+++ compiler-rt/trunk/test/msan/strxfrm.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/sync_lock_set_and_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/sync_lock_set_and_test.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/sync_lock_set_and_test.cc (original)
+++ compiler-rt/trunk/test/msan/sync_lock_set_and_test.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 int main(void) {
   int i;

Modified: compiler-rt/trunk/test/msan/textdomain.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/textdomain.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/textdomain.cc (original)
+++ compiler-rt/trunk/test/msan/textdomain.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 #include <libintl.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/test/msan/times.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/times.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/times.cc (original)
+++ compiler-rt/trunk/test/msan/times.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/tls_reuse.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/tls_reuse.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/tls_reuse.cc (original)
+++ compiler-rt/trunk/test/msan/tls_reuse.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 // Check that when TLS block is reused between threads, its shadow is cleaned.
 

Modified: compiler-rt/trunk/test/msan/tzset.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/tzset.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/tzset.cc (original)
+++ compiler-rt/trunk/test/msan/tzset.cc Mon Mar  2 13:34:27 2015
@@ -1,4 +1,4 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
 
 #include <stdlib.h>
 #include <string.h>

Modified: compiler-rt/trunk/test/msan/unaligned_read_origin.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/unaligned_read_origin.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/unaligned_read_origin.cc (original)
+++ compiler-rt/trunk/test/msan/unaligned_read_origin.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s < %t.out
 
 #include <sanitizer/msan_interface.h>

Modified: compiler-rt/trunk/test/msan/unpoison_string.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/unpoison_string.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/unpoison_string.cc (original)
+++ compiler-rt/trunk/test/msan/unpoison_string.cc Mon Mar  2 13:34:27 2015
@@ -1,6 +1,6 @@
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t
 // RUN: %run %t
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t
 // RUN: %run %t
 
 #include <assert.h>

Modified: compiler-rt/trunk/test/msan/use-after-free.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/use-after-free.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/use-after-free.cc (original)
+++ compiler-rt/trunk/test/msan/use-after-free.cc Mon Mar  2 13:34:27 2015
@@ -1,19 +1,19 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
-// RUN: %clangxx_msan -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out
 
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O0 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O1 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O1 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O2 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O2 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
-// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O3 %s -o %t && not %run %t >%t.out 2>&1
+// RUN: %clangxx_msan -fsanitize-memory-track-origins -O3 %s -o %t && not %run %t >%t.out 2>&1
 // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-ORIGINS < %t.out
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/msan/vector_cvt.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/vector_cvt.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/vector_cvt.cc (original)
+++ compiler-rt/trunk/test/msan/vector_cvt.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 %s -o %t && %run %t
-// RUN: %clangxx_msan -DPOSITIVE -m64 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -O0 %s -o %t && %run %t
+// RUN: %clangxx_msan -DPOSITIVE -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 #include <emmintrin.h>
 

Modified: compiler-rt/trunk/test/msan/vector_select.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/vector_select.cc?rev=230999&r1=230998&r2=230999&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/vector_select.cc (original)
+++ compiler-rt/trunk/test/msan/vector_select.cc Mon Mar  2 13:34:27 2015
@@ -1,5 +1,5 @@
-// RUN: %clangxx_msan -m64 -O0 %s -c -o %t
-// RUN: %clangxx_msan -m64 -O3 %s -c -o %t
+// RUN: %clangxx_msan -O0 %s -c -o %t
+// RUN: %clangxx_msan -O3 %s -c -o %t
 
 // Regression test for MemorySanitizer instrumentation of a select instruction
 // with vector arguments.





More information about the llvm-commits mailing list