Post-merge fixes

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -205,6 +205,12 @@ endif ()
 check_cxx_compiler_flag("-UTESTFLAG" FLANG_RT_SUPPORTS_UNDEFINE_FLAG)
 
 
+# function checks
+find_package(Backtrace)
+set(HAVE_BACKTRACE ${Backtrace_FOUND})
+set(BACKTRACE_HEADER ${Backtrace_HEADER})
+
+
 #####################
 # Build Preparation #
 #####################

flang-rt/cmake/config.h.cmake.in

@@ -16,4 +16,9 @@
    don't. */
 #cmakedefine01 HAVE_DECL_STRERROR_S
 
+/* Define to 1 if you have the `backtrace' function. */
+#cmakedefine HAVE_BACKTRACE ${HAVE_BACKTRACE}
+
+#define BACKTRACE_HEADER <${BACKTRACE_HEADER}>
+
 #endif

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -28,13 +28,15 @@
 #   ADDITIONAL_HEADERS
 #     May specify header files for IDE generators.
 #   INCLUDE_DIRECTORIES
-#     Additional include_directories for all added targets
+#     Additional target_include_directories for all added targets
+#   LINK_LIBRARIES
+#     Additional target_link_libraries for all added targets
 #   TARGET_PROPERTIES
 #     Set target properties of all added targets
 # )
 function (add_flangrt_library name)
   set(options STATIC SHARED OBJECT INSTALL_WITH_TOOLCHAIN EXCLUDE_FROM_ALL LINK_TO_LLVM)
-  set(multiValueArgs ADDITIONAL_HEADERS INCLUDE_DIRECTORIES TARGET_PROPERTIES)
+  set(multiValueArgs ADDITIONAL_HEADERS INCLUDE_DIRECTORIES LINK_LIBRARIES TARGET_PROPERTIES)
   cmake_parse_arguments(ARG
     "${options}"
     ""
@@ -160,6 +162,10 @@ function (add_flangrt_library name)
     target_include_directories(${name} ${ARG_INCLUDE_DIRECTORIES})
   endif ()
 
+  if (ARG_LINK_LIBRARIES)
+    target_link_libraries(${name} PUBLIC ${ARG_LINK_LIBRARIES})
+  endif ()
+
   # If this is part of the toolchain, put it into the compiler's resource
   # directory. Otherwise it is part of testing and is not installed at all.
   # TODO: Consider multi-configuration builds (MSVC_IDE, "Ninja Multi-Config")

flang-rt/lib/runtime/CMakeLists.txt

@@ -124,12 +124,13 @@ else ()
   set(f128_sources "")
 endif ()
 
-
 set(sources ${supported_sources} ${host_sources} ${f128_sources})
 
+
 if (NOT WIN32)
   add_flangrt_library(flang_rt.runtime STATIC
     ${sources}
+    LINK_LIBRARIES ${Backtrace_LIBRARY}
     INSTALL_WITH_TOOLCHAIN
     ADDITIONAL_HEADERS ${public_headers} ${private_headers}
   )
@@ -151,6 +152,7 @@ else()
     add_flangrt_library(${name} ${libtype}
         ${sources}
         ${ARGN}
+        LINK_LIBRARIES ${Backtrace_LIBRARY}
         ADDITIONAL_HEADERS ${public_headers} ${private_headers}
       )