This is an archive of the discontinued LLVM Phabricator instance.

Differential D45696

[sanitizer] Fix OSX build failure post D45457
ClosedPublic

Authored by cryptoad on Apr 16 2018, 11:18 AM.

Details

Reviewers
None
Commits
rG25eae5c8796d: [sanitizer] Fix OSX build failure post D45457
rL330146: [sanitizer] Fix OSX build failure post D45457
rCRT330146: [sanitizer] Fix OSX build failure post D45457
Summary

It looks like OSX's UBSan needs a "NoHooks" version of
RTSanitizerCommonSymbolizer to work build properly.

Diff Detail

Event Timeline

cryptoad created this revision.Apr 16 2018, 11:18 AM
Herald added subscribers: Restricted Project, llvm-commits, delcypher and 2 others. · View Herald TranscriptApr 16 2018, 11:18 AM
Harbormaster completed remote builds in B17109: Diff 142665.Apr 16 2018, 11:18 AM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 16 2018, 11:21 AM
Closed by commit rCRT330146: [sanitizer] Fix OSX build failure post D45457 (authored by cryptoad). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
sanitizer_common/
6 lines
ubsan/
2 lines

Diff 142666

lib/sanitizer_common/CMakeLists.txt

Show First 20 Lines • Show All 235 Lines • ▼ Show 20 Linesadd_compiler_rt_object_libraries(RTSanitizerCommonNoHooks
CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS} CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS}
DEFS ${SANITIZER_COMMON_DEFINITIONS}) DEFS ${SANITIZER_COMMON_DEFINITIONS})
add_compiler_rt_object_libraries(RTSanitizerCommonLibcNoHooks add_compiler_rt_object_libraries(RTSanitizerCommonLibcNoHooks
${OS_OPTION} ${OS_OPTION}
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH} ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
SOURCES ${SANITIZER_LIBCDEP_SOURCES} SOURCES ${SANITIZER_LIBCDEP_SOURCES}
CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS} CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS}
DEFS ${SANITIZER_COMMON_DEFINITIONS}) DEFS ${SANITIZER_COMMON_DEFINITIONS})
add_compiler_rt_object_libraries(RTSanitizerCommonSymbolizerNoHooks
${OS_OPTION}
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
SOURCES ${SANITIZER_SYMBOLIZER_SOURCES}
CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS}
DEFS ${SANITIZER_COMMON_DEFINITIONS})
if(OS_NAME MATCHES "SunOS") if(OS_NAME MATCHES "SunOS")
# Solaris ld doesn't support the non-standard GNU ld extension of adding # Solaris ld doesn't support the non-standard GNU ld extension of adding
# __start_SECNAME and __stop_SECNAME labels to sections whose names are # __start_SECNAME and __stop_SECNAME labels to sections whose names are
# valid C identifiers. Instead we add our own definitions for the # valid C identifiers. Instead we add our own definitions for the
# __sancov_guards section. # __sancov_guards section.
add_compiler_rt_object_libraries(SancovBegin add_compiler_rt_object_libraries(SancovBegin
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH} ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

lib/ubsan/CMakeLists.txt

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines add_compiler_rt_runtime(clang_rt.ubsan
STATIC STATIC
OS ${SANITIZER_COMMON_SUPPORTED_OS} OS ${SANITIZER_COMMON_SUPPORTED_OS}
ARCHS ${UBSAN_SUPPORTED_ARCH} ARCHS ${UBSAN_SUPPORTED_ARCH}
OBJECT_LIBS RTUbsan OBJECT_LIBS RTUbsan
RTUbsan_standalone RTUbsan_standalone
RTSanitizerCommonNoHooks RTSanitizerCommonNoHooks
RTSanitizerCommonLibcNoHooks RTSanitizerCommonLibcNoHooks
RTSanitizerCommonCoverage RTSanitizerCommonCoverage
RTSanitizerCommonSymbolizer RTSanitizerCommonSymbolizerNoHooks
RTInterception RTInterception
LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS} LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS}
PARENT_TARGET ubsan) PARENT_TARGET ubsan)
endif() endif()
else() else()
# Common parts of UBSan runtime. # Common parts of UBSan runtime.
add_compiler_rt_object_libraries(RTUbsan add_compiler_rt_object_libraries(RTUbsan
▲ Show 20 Lines • Show All 103 Lines • Show Last 20 Lines