summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/tsan/tests/rtl
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-09-18 09:09:35 +0000
committerAlexey Samsonov <samsonov@google.com>2012-09-18 09:09:35 +0000
commit848abbd236bc42b48b843b187f46a96244efe3f4 (patch)
tree0de73541f84bc8426f25ad689c723cb366218a15 /compiler-rt/lib/tsan/tests/rtl
parent3040830fcd40a0a00f954def1cbc65c66216c1ca (diff)
downloadbcm5719-llvm-848abbd236bc42b48b843b187f46a96244efe3f4.tar.gz
bcm5719-llvm-848abbd236bc42b48b843b187f46a96244efe3f4.zip
[TSan] s/uintptr_t/intptr_t in TSan test and enforce stack size limit in one of TSan output tests that somewhy fails otherwise
llvm-svn: 164116
Diffstat (limited to 'compiler-rt/lib/tsan/tests/rtl')
-rw-r--r--compiler-rt/lib/tsan/tests/rtl/tsan_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
index 50fee84ace3..2184284d39c 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
@@ -34,7 +34,7 @@ int run_tests(int argc, char **argv) {
TestMutexBeforeInit(); // Mutexes must be usable before __tsan_init();
__tsan_init();
__tsan_func_entry(__builtin_return_address(0));
- __tsan_func_entry((void*)((uintptr_t)&run_tests + 1));
+ __tsan_func_entry((void*)((intptr_t)&run_tests + 1));
testing::GTEST_FLAG(death_test_style) = "threadsafe";
testing::InitGoogleTest(&argc, argv);
OpenPOWER on IntegriCloud