diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
commit | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch) | |
tree | b48831a898906734f8884d08b6e18f1144ee2b82 /src/pal/tests/palsuite/composite/synchronization | |
parent | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff) | |
download | coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2 coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip |
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'src/pal/tests/palsuite/composite/synchronization')
5 files changed, 5 insertions, 19 deletions
diff --git a/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt index fc357ed258..e6b6b0c805 100644 --- a/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt +++ b/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt @@ -14,7 +14,5 @@ add_executable(paltest_synchronization_criticalsection add_dependencies(paltest_synchronization_criticalsection coreclrpal) target_link_libraries(paltest_synchronization_criticalsection - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt index 9a02993916..5a2a503137 100644 --- a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt +++ b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt @@ -15,7 +15,5 @@ add_executable(paltest_synchronization_nativecriticalsection add_dependencies(paltest_synchronization_nativecriticalsection coreclrpal) target_link_libraries(paltest_synchronization_nativecriticalsection - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp index 40efacd7c9..0ccd5c9419 100644 --- a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp +++ b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp @@ -445,13 +445,9 @@ ULONGLONG GetTicks(void) asm volatile("rdtsc":"=a" (a), "=d" (d)); return ((ULONGLONG)((unsigned int)(d)) << 32) | (unsigned int)(a); #else -#if defined(__sparc__) || (defined (_HPUX_) && defined(__ia64__)) - return (ULONGLONG)gethrtime(); -#else // #error Don''t know how to get ticks on this platform return (ULONGLONG)gethrtime(); -#endif // __sparc__ -#endif // _X86_ +#endif // i386 } diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt index 717bdd6b20..b942096363 100644 --- a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt +++ b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt @@ -16,7 +16,5 @@ add_executable(paltest_synchronization_nativecs_interlocked add_dependencies(paltest_synchronization_nativecs_interlocked coreclrpal) target_link_libraries(paltest_synchronization_nativecs_interlocked - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp index 4c19d3b0de..ec5c1c365f 100644 --- a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp +++ b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp @@ -449,13 +449,9 @@ ULONGLONG GetTicks(void) asm volatile("rdtsc":"=a" (a), "=d" (d)); return ((ULONGLONG)((unsigned int)(d)) << 32) | (unsigned int)(a); #else -#if defined(__sparc__) || (defined (_HPUX_) && defined(__ia64__)) - return (ULONGLONG)gethrtime(); -#else // #error Don''t know how to get ticks on this platform return (ULONGLONG)gethrtime(); -#endif // __sparc__ -#endif // _X86_ +#endif // i386 } |