This is an archive of the discontinued LLVM Phabricator instance.

Differential D108503

[scudo][standalone] Link tests against libatomic if libatomic exists
ClosedPublic

Authored by amyk on Aug 20 2021, 9:27 PM.

Details

Reviewers
cryptoad
tejohnson
vitalybuka
jsji
Commits
rG4cd8dd3fe05e: [scudo][standalone] Link tests against libatomic if libatomic exists
Summary

It is possible that libatomic does not exist on some systems. This patch updates
the scudo standalone tests to link against libatomic if the library exists.

This is an update to the original patch: https://reviews.llvm.org/D64134 and
aims to resolve https://bugs.llvm.org/show_bug.cgi?id=51431.

Diff Detail

Event Timeline

amyk created this revision.Aug 20 2021, 9:27 PM
Herald added subscribers: jfb, mgorny. · View Herald TranscriptAug 20 2021, 9:27 PM
amyk requested review of this revision.Aug 20 2021, 9:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 20 2021, 9:27 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B120660: Diff 367940.Aug 20 2021, 10:02 PM
vitalybuka accepted this revision.Aug 20 2021, 11:59 PM
This revision is now accepted and ready to land.Aug 20 2021, 11:59 PM
Closed by commit rG4cd8dd3fe05e: [scudo][standalone] Link tests against libatomic if libatomic exists (authored by amyk). · Explain WhyAug 22 2021, 11:47 AM
This revision was automatically updated to reflect the committed changes.
amyk added a commit: rG4cd8dd3fe05e: [scudo][standalone] Link tests against libatomic if libatomic exists.

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
standalone/
tests/
5 lines

Diff 367993

compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt

Show All 33 Lines
# gtests requires c++ # gtests requires c++
set(LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS}) set(LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS})
foreach(lib ${SANITIZER_TEST_CXX_LIBRARIES}) foreach(lib ${SANITIZER_TEST_CXX_LIBRARIES})
list(APPEND LINK_FLAGS -l${lib}) list(APPEND LINK_FLAGS -l${lib})
endforeach() endforeach()
list(APPEND LINK_FLAGS -pthread) list(APPEND LINK_FLAGS -pthread)
# Linking against libatomic is required with some compilers # Linking against libatomic is required with some compilers
check_library_exists(atomic __atomic_load_8 "" COMPILER_RT_HAS_LIBATOMIC)
if (COMPILER_RT_HAS_LIBATOMIC)
list(APPEND LINK_FLAGS -latomic) list(APPEND LINK_FLAGS -latomic)
endif()
set(SCUDO_TEST_HEADERS set(SCUDO_TEST_HEADERS
scudo_unit_test.h scudo_unit_test.h
) )
foreach (header ${SCUDO_HEADERS}) foreach (header ${SCUDO_HEADERS})
list(APPEND SCUDO_TEST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header}) list(APPEND SCUDO_TEST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header})
endforeach() endforeach()
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines