This is an archive of the discontinued LLVM Phabricator instance.

Differential D3939

Fix building 32-bit common sanitizer tests on FreeBSD 9.2
ClosedPublic

Authored by kutuzov.viktor.84 on May 28 2014, 7:29 AM.

Details

Reviewers
kcc
samsonov

Diff Detail

Event Timeline

kutuzov.viktor.84 updated this revision to Diff 9879.May 28 2014, 7:29 AM
kutuzov.viktor.84 retitled this revision from to Fix building 32-bit common sanitizer tests on FreeBSD 9.2.
kutuzov.viktor.84 updated this object.
kutuzov.viktor.84 edited the test plan for this revision. (Show Details)
kutuzov.viktor.84 added reviewers: kcc, samsonov.
kutuzov.viktor.84 added subscribers: Unknown Object (MLST), emaste.
samsonov accepted this revision.May 28 2014, 2:17 PM
samsonov edited edge metadata.

LGTM

This revision is now accepted and ready to land.May 28 2014, 2:17 PM
kutuzov.viktor.84 added a comment.May 29 2014, 4:43 AM

Committed as rL209804.

kutuzov.viktor.84 closed this revision.Dec 10 2014, 12:09 PM

Revision Contents

PathSize
lib/
sanitizer_common/
tests/
5 lines

Diff 9879

lib/sanitizer_common/tests/CMakeLists.txt

Show First 20 Lines • Show All 62 Lines • ▼ Show 20 Linesif(MSVC)
list(APPEND SANITIZER_TEST_CFLAGS_COMMON list(APPEND SANITIZER_TEST_CFLAGS_COMMON
-Wno-unknown-pragmas -Wno-unknown-pragmas
-Wno-undefined-inline) -Wno-undefined-inline)
endif() endif()
append_if(COMPILER_RT_HAS_LIBSTDCXX -lstdc++ SANITIZER_TEST_LINK_FLAGS_COMMON) append_if(COMPILER_RT_HAS_LIBSTDCXX -lstdc++ SANITIZER_TEST_LINK_FLAGS_COMMON)
append_if(COMPILER_RT_HAS_LIBDL -ldl SANITIZER_TEST_LINK_FLAGS_COMMON) append_if(COMPILER_RT_HAS_LIBDL -ldl SANITIZER_TEST_LINK_FLAGS_COMMON)
append_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread SANITIZER_TEST_LINK_FLAGS_COMMON) append_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread SANITIZER_TEST_LINK_FLAGS_COMMON)
# x86_64 FreeBSD 9.2 additionally requires libc++ to build the tests. # x86_64 FreeBSD 9.2 additionally requires libc++ to build the tests. Also,
# 'libm' shall be specified explicitly to build i386 tests.
if(CMAKE_SYSTEM MATCHES "FreeBSD-9.2-RELEASE") if(CMAKE_SYSTEM MATCHES "FreeBSD-9.2-RELEASE")
list(APPEND SANITIZER_TEST_LINK_FLAGS_COMMON "-lc++") list(APPEND SANITIZER_TEST_LINK_FLAGS_COMMON "-lc++ -lm")
endif() endif()
include_directories(..) include_directories(..)
include_directories(../..) include_directories(../..)
# Adds static library which contains sanitizer_common object file # Adds static library which contains sanitizer_common object file
# (universal binary on Mac and arch-specific object files on Linux). # (universal binary on Mac and arch-specific object files on Linux).
macro(add_sanitizer_common_lib library) macro(add_sanitizer_common_lib library)
▲ Show 20 Lines • Show All 118 Lines • Show Last 20 Lines