This is an archive of the discontinued LLVM Phabricator instance.

Differential D93634

[compiler-rt][tests] Define TARGET_FLAGS
ClosedPublic

Authored by hvdijk on Dec 21 2020, 7:12 AM.

Details

Reviewers
samsonov
vitalybuka
Commits
rGb01b964d3776: [compiler-rt][tests] Define TARGET_FLAGS
Summary

D36116 refactored the logic of tests and removed the definition of TARGET_FLAGS, but left one use of it. Restore its definition for that one use, so that an x86_64 test is compiled with -m64.

Diff Detail

Event Timeline

hvdijk created this revision.Dec 21 2020, 7:12 AM
Herald added subscribers: pengfei, mgorny, dberris. · View Herald TranscriptDec 21 2020, 7:12 AM
hvdijk requested review of this revision.Dec 21 2020, 7:12 AM
Herald added a subscriber: Restricted Project. · View Herald TranscriptDec 21 2020, 7:12 AM
Harbormaster completed remote builds in B83149: Diff 313034.Dec 21 2020, 7:48 AM
hvdijk added a comment.Jan 11 2021, 2:02 PM

Ping

hvdijk added a comment.Jan 24 2021, 3:47 AM

Ping 2

vitalybuka accepted this revision.Jan 27 2021, 10:26 PM
This revision is now accepted and ready to land.Jan 27 2021, 10:26 PM
This revision was landed with ongoing or failed builds.Jan 30 2021, 5:06 AM
Closed by commit rGb01b964d3776: [compiler-rt][tests] Define TARGET_FLAGS (authored by hvdijk). · Explain Why
This revision was automatically updated to reflect the committed changes.
hvdijk added a commit: rGb01b964d3776: [compiler-rt][tests] Define TARGET_FLAGS.

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
tests/
1 line

Diff 320294

compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt

Show First 20 Lines • Show All 154 Lines • ▼ Show 20 Lines generate_compiler_rt_tests(SANITIZER_TEST_OBJECTS SanitizerUnitTests
DEPS gtest DEPS gtest
CFLAGS ${SANITIZER_TEST_CFLAGS_COMMON} ${extra_flags} CFLAGS ${SANITIZER_TEST_CFLAGS_COMMON} ${extra_flags}
LINK_FLAGS ${SANITIZER_TEST_LINK_FLAGS_COMMON} ${extra_flags}) LINK_FLAGS ${SANITIZER_TEST_LINK_FLAGS_COMMON} ${extra_flags})
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND "${arch}" STREQUAL "x86_64") if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND "${arch}" STREQUAL "x86_64")
# Test that the libc-independent part of sanitizer_common is indeed # Test that the libc-independent part of sanitizer_common is indeed
# independent of libc, by linking this binary without libc (here) and # independent of libc, by linking this binary without libc (here) and
# executing it (unit test in sanitizer_nolibc_test.cpp). # executing it (unit test in sanitizer_nolibc_test.cpp).
get_target_flags_for_arch(${arch} TARGET_FLAGS)
clang_compile(sanitizer_nolibc_test_main.${arch}.o clang_compile(sanitizer_nolibc_test_main.${arch}.o
sanitizer_nolibc_test_main.cpp sanitizer_nolibc_test_main.cpp
CFLAGS ${SANITIZER_TEST_CFLAGS_COMMON} ${TARGET_FLAGS} CFLAGS ${SANITIZER_TEST_CFLAGS_COMMON} ${TARGET_FLAGS}
DEPS ${SANITIZER_TEST_COMPILE_DEPS}) DEPS ${SANITIZER_TEST_COMPILE_DEPS})
add_compiler_rt_test(SanitizerUnitTests "Sanitizer-${arch}-Test-Nolibc" ${arch} add_compiler_rt_test(SanitizerUnitTests "Sanitizer-${arch}-Test-Nolibc" ${arch}
OBJECTS sanitizer_nolibc_test_main.${arch}.o OBJECTS sanitizer_nolibc_test_main.${arch}.o
-Wl,-whole-archive -Wl,-whole-archive
libRTSanitizerCommon.test.nolibc.${arch}.a libRTSanitizerCommon.test.nolibc.${arch}.a
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines