0015-libcxx-Add-compiler-runtime-library-to-link-step-for.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From d596b3bcd348b21d523e23e60f50541f9b0e40be Mon Sep 17 00:00:00 2001
  2. From: Jun Yuan Tan <junyuan.tan@starfivetech.com>
  3. Date: Fri, 22 Oct 2021 11:39:25 +0800
  4. Subject: [PATCH] libcxx: Add compiler runtime library to link step for libcxx
  5. This corrects "undefined reference to __divti3"
  6. Upstream-Status: Inappropriate [configuration]
  7. Rebased to LLVM 14.0.0 by Jun Yuan Tan
  8. Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
  9. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  10. Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
  11. ---
  12. libcxx/src/CMakeLists.txt | 4 ++--
  13. 1 file changed, 2 insertions(+), 2 deletions(-)
  14. diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
  15. index b5a870a5a499..d864080561d0 100644
  16. --- a/libcxx/src/CMakeLists.txt
  17. +++ b/libcxx/src/CMakeLists.txt
  18. @@ -197,7 +197,7 @@ split_list(LIBCXX_LINK_FLAGS)
  19. if (LIBCXX_ENABLE_SHARED)
  20. add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
  21. target_link_libraries(cxx_shared PUBLIC cxx-headers
  22. - PRIVATE ${LIBCXX_LIBRARIES})
  23. + PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
  24. set_target_properties(cxx_shared
  25. PROPERTIES
  26. COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
  27. @@ -275,7 +275,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
  28. if (LIBCXX_ENABLE_STATIC)
  29. add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
  30. target_link_libraries(cxx_static PUBLIC cxx-headers
  31. - PRIVATE ${LIBCXX_LIBRARIES})
  32. + PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
  33. set_target_properties(cxx_static
  34. PROPERTIES
  35. COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
  36. --
  37. 2.33.0