This is an archive of the discontinued LLVM Phabricator instance.

Differential D97182

[clang] fix cmake wrong variable name from RTLIBS to RTLIB
AbandonedPublic

Authored by philass on Feb 21 2021, 11:56 PM.

Details

Reviewers
chandlerc
saugustine
Summary

RTSLIBS should instread be RTLIB

 if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
   if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
     set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
-  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") 
+  elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
     set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
   endif()
 endif()

Since CLANG_DEFAULT_RTLIBS should be CLANG_DEFAULT_RTLIB the line

set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)

will never be reached.

This addresses https://bugs.llvm.org/show_bug.cgi?id=48291

Diff Detail

Unit TestsFailed

TimeTest
180 msx64 debian > Profile-x86_64.Profile-x86_64::instrprof-gc-sections.c

Event Timeline

philass created this revision.Feb 21 2021, 11:56 PM
Herald added a subscriber: mgorny. · View Herald TranscriptFeb 21 2021, 11:56 PM
philass requested review of this revision.Feb 21 2021, 11:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 21 2021, 11:56 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B90186: Diff 325377.Feb 22 2021, 12:30 AM
philass added a reviewer: saugustine.Feb 22 2021, 12:15 PM
philass updated this revision to Diff 325690.Feb 22 2021, 11:25 PM

Rerun failed build that may be fixed in

https://reviews.llvm.org/rG4827492d9fcfe4ac5df4f319e935e33bec946195

philass abandoned this revision.May 31 2021, 10:26 PM

Revision Contents

PathSize
clang/
2 lines

Diff 325377

clang/CMakeLists.txt

Show First 20 Lines • Show All 256 Lines • ▼ Show 20 Lines set(CLANG_DEFAULT_RTLIB "" CACHE STRING
"Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE) "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE)
endif() endif()
set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING
"Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)") "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)")
if (CLANG_DEFAULT_UNWINDLIB STREQUAL "") if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc") if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE) set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE) set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
endif() endif()
endif() endif()
if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "" OR if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "" OR
CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR
CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR
CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind")) CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind"))
▲ Show 20 Lines • Show All 617 Lines • Show Last 20 Lines