This is an archive of the discontinued LLVM Phabricator instance.

Differential D53686

[CMake] When built with LLVM, not use `-Wl,-z,defs`
ClosedPublic

Authored by ychen on Oct 24 2018, 6:44 PM.

Details

Reviewers
srhines
compnerd
phosek
rnk
Commits
rG54153c3b5ee9: [CMake] When built with LLVM, not use `-Wl,-z,defs`
rCRT345547: [CMake] When built with LLVM, not use `-Wl,-z,defs`
rL345547: [CMake] When built with LLVM, not use `-Wl,-z,defs`
Summary

This matches standalone build behavior. For https://bugs.llvm.org/show_bug.cgi?id=28681

Diff Detail

Event Timeline

ychen created this revision.Oct 24 2018, 6:44 PM
Herald added subscribers: Restricted Project, llvm-commits, delcypher, mgorny. · View Herald TranscriptOct 24 2018, 6:44 PM
Harbormaster completed remote builds in B24183: Diff 171031.Oct 24 2018, 6:45 PM
ychen edited the summary of this revision. (Show Details)Oct 24 2018, 6:47 PM
ychen added reviewers: srhines, compnerd, phosek, rnk.
compnerd accepted this revision.Oct 24 2018, 8:18 PM

Yeah, this seems right. The builtins currently have some dependencies on libm, so you won't be able to build with -z defs.

This revision is now accepted and ready to land.Oct 24 2018, 8:18 PM
phosek added inline comments.Oct 24 2018, 8:21 PM
CMakeLists.txt
378

Would it make sense to do it unconditionally? If the flag isn't present it should be a no-op.

ychen updated this revision to Diff 171035.EditedOct 24 2018, 8:53 PM

Could you please help land it for me? I don't have access. Thank you!

Harbormaster completed remote builds in B24185: Diff 171035.Oct 24 2018, 8:53 PM
Closed by commit rL345547: [CMake] When built with LLVM, not use `-Wl,-z,defs` (authored by phosek). · Explain WhyOct 29 2018, 3:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
1 line

Diff 171035

CMakeLists.txt

Show First 20 Lines • Show All 369 Lines • ▼ Show 20 Lines
append_list_if(MINGW -fms-extensions SANITIZER_COMMON_CFLAGS) append_list_if(MINGW -fms-extensions SANITIZER_COMMON_CFLAGS)
# Set common link flags. # Set common link flags.
append_list_if(COMPILER_RT_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs SANITIZER_COMMON_LINK_FLAGS) append_list_if(COMPILER_RT_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs SANITIZER_COMMON_LINK_FLAGS)
if (COMPILER_RT_USE_BUILTINS_LIBRARY) if (COMPILER_RT_USE_BUILTINS_LIBRARY)
list(APPEND SANITIZER_COMMON_LINK_LIBS ${COMPILER_RT_BUILTINS_LIBRARY}) list(APPEND SANITIZER_COMMON_LINK_LIBS ${COMPILER_RT_BUILTINS_LIBRARY})
string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
phosekUnsubmitted
Not Done
ReplyInline Actions

Would it make sense to do it unconditionally? If the flag isn't present it should be a no-op.

phosek: Would it make sense to do it unconditionally? If the flag isn't present it should be a no-op.
else() else()
if (ANDROID) if (ANDROID)
append_list_if(COMPILER_RT_HAS_GCC_LIB gcc SANITIZER_COMMON_LINK_LIBS) append_list_if(COMPILER_RT_HAS_GCC_LIB gcc SANITIZER_COMMON_LINK_LIBS)
else() else()
append_list_if(COMPILER_RT_HAS_GCC_S_LIB gcc_s SANITIZER_COMMON_LINK_LIBS) append_list_if(COMPILER_RT_HAS_GCC_S_LIB gcc_s SANITIZER_COMMON_LINK_LIBS)
endif() endif()
endif() endif()
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines