Implement clang resource directory logic

.github/workflows/main.yml

@@ -40,8 +40,6 @@ jobs:
           - job_name: Linux aarch64
             os: ubuntu-22.04-arm
             arch: aarch64
-            base_cmake_flags: >-
-              -DCOMPILER_RT_LIBDIR_OS=aarch64-unknown-linux-gnu
             extra_cmake_flags: >-
               -DCMAKE_C_COMPILER=clang
               -DCMAKE_CXX_COMPILER=clang++
@@ -56,7 +54,6 @@ jobs:
             container_image: alpine:3.21
             arch: x86_64
             base_cmake_flags: >-
-              -DCOMPILER_RT_LIBDIR_OS=linux
               -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=x86_64
               -DLLVM_IS_SHARED=OFF
               -DLDC_ENABLE_PLUGINS=OFF
@@ -265,7 +262,6 @@ jobs:
             arch: aarch64
             android_x86_arch: x86_64
             extra_cmake_flags: >-
-              -DCOMPILER_RT_LIBDIR_OS=linux
               -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=aarch64-android
 
     name: ${{ matrix.job_name }}

CMakeLists.txt

@@ -805,14 +805,8 @@ endif()
 # LLVM_LIBRARY_DIRS/clang/<version>/lib/<OS>/ , for example
 # LLVM_LIBRARY_DIRS/clang/4.0.0/lib/darwin/ , but we allow the user to specify
 # another directory.
-set(COMPILER_RT_BASE_DIR "${LLVM_LIBRARY_DIRS}" CACHE PATH "Base path of compiler-rt libraries. If they in are /usr/lib/clang/17/lib/linux/libclang_rt* you should set this value to /usr/lib")
-# If it's different than the default it will need to be added to the config files
-if(COMPILER_RT_BASE_DIR STREQUAL LLVM_LIBRARY_DIRS)
-    set(WANT_COMPILER_RT_LIBDIR_CONFIG FALSE)
-else()
-    set(WANT_COMPILER_RT_LIBDIR_CONFIG TRUE)
-endif()
-set(COMPILER_RT_LIBDIR "${COMPILER_RT_BASE_DIR}/clang")
+set(COMPILER_RT_BASE_DIR "${LLVM_LIBRARY_DIRS}/clang" CACHE PATH "Base path of compiler-rt libraries. If they in are /usr/lib/clang/17/lib/linux/libclang_rt* you should set this value to /usr/lib/clang")
+set(COMPILER_RT_LIBDIR "${COMPILER_RT_BASE_DIR}")
 if(LDC_LLVM_VER LESS 1600)
     set(COMPILER_RT_LIBDIR "${COMPILER_RT_LIBDIR}/${LLVM_VERSION_BASE_STRING}")
 else()
@@ -821,13 +815,25 @@ endif()
 set(COMPILER_RT_LIBDIR "${COMPILER_RT_LIBDIR}/lib")
 if(APPLE)
     set(COMPILER_RT_LIBDIR "${COMPILER_RT_LIBDIR}/darwin")
+elseif(ANDROID)
+    set(COMPILER_RT_LIBDIR "${COMPILER_RT_LIBDIR}/linux")
 elseif(UNIX)
-    set(COMPILER_RT_LIBDIR_OS_DEFAULT "x86_64-unknown-linux-gnu")
+    set(COMPILER_RT_LIBDIR_OS_DEFAULT "${LLVM_HOST_TARGET}") # default when building compiler-rt alongside LLVM
+    if(NOT EXISTS "${COMPILER_RT_LIBDIR}/${COMPILER_RT_LIBDIR_OS_DEFAULT}")
+        # default when building compiler-rt separately: OS name alone in lowercase
+        string(TOLOWER "${CMAKE_SYSTEM_NAME}" lowercase_CMAKE_SYSTEM_NAME)
+        if(EXISTS "${COMPILER_RT_LIBDIR}/${lowercase_CMAKE_SYSTEM_NAME}")
+            set(COMPILER_RT_LIBDIR_OS_DEFAULT "${lowercase_CMAKE_SYSTEM_NAME}")
+        endif()
+    endif()
     set(COMPILER_RT_LIBDIR_OS "${COMPILER_RT_LIBDIR_OS_DEFAULT}"   CACHE STRING "Non-Mac Posix: OS used as directory name for the compiler-rt source libraries, e.g., 'freebsd'.")
     set(COMPILER_RT_LIBDIR "${COMPILER_RT_LIBDIR}/${COMPILER_RT_LIBDIR_OS}")
 elseif(WIN32)
     set(COMPILER_RT_LIBDIR "${COMPILER_RT_LIBDIR}/windows")
 endif()
+if(NOT EXISTS "${COMPILER_RT_LIBDIR}")
+    message(WARNING "Expected compiler-rt directory '${COMPILER_RT_LIBDIR}' does not exist. To include PGO and sanitizers support, COMPILER_RT_BASE_DIR and/or COMPILER_RT_LIBDIR_OS might need to be set explicitly. See docs/compiler_rt.md.")
+endif()
 if(LLVM_IS_SHARED)
     set(LDC_INSTALL_LLVM_RUNTIME_LIBS_DEFAULT OFF)
 else()
@@ -847,9 +853,6 @@ message(STATUS "-- Including LLVM compiler-rt libraries (LDC_INSTALL_LLVM_RUNTIM
 if (LDC_INSTALL_LLVM_RUNTIME_LIBS)
     # Locate LLVM sanitizer runtime libraries, and copy them to our lib folder
 
-    # No need to add another libdir, the default ldc one will have the libraries
-    set(WANT_COMPILER_RT_LIBDIR_CONFIG FALSE)
-
     if(APPLE)
         copy_compilerrt_lib("libclang_rt.asan_osx_dynamic.dylib" "libldc_rt.asan.dylib" TRUE)
         copy_compilerrt_lib("libclang_rt.lsan_osx_dynamic.dylib" "libldc_rt.lsan.dylib" TRUE)
@@ -894,9 +897,16 @@ if (LDC_INSTALL_LLVM_RUNTIME_LIBS)
     endif()
 endif()
 
-if(WANT_COMPILER_RT_LIBDIR_CONFIG)
-    message(STATUS "Adding ${COMPILER_RT_LIBDIR} to libdir in configuration files")
-    set(OPTIONAL_COMPILER_RT_DIR "\n        \"${COMPILER_RT_LIBDIR}\",")
+# If everything else if insufficient, the user can specify
+# -DCOMPILER_RT_LIBDIR_CONFIG to embed an arbitrary value.
+if(NOT DEFINED COMPILER_RT_LIBDIR_CONFIG)
+    if(NOT LDC_INSTALL_LLVM_RUNTIME_LIBS)
+        set(COMPILER_RT_LIBDIR_CONFIG "${COMPILER_RT_LIBDIR}")
+    endif()
+endif()
+if(DEFINED COMPILER_RT_LIBDIR_CONFIG)
+    message(STATUS "Adding ${COMPILER_RT_LIBDIR_CONFIG} to lib-dirs in configuration file")
+    set(OPTIONAL_COMPILER_RT_DIR "\n        \"${COMPILER_RT_LIBDIR_CONFIG}\", // compiler-rt directory")
 endif()
 
 #

cmake/Modules/FindLLVM.cmake

@@ -142,6 +142,7 @@ else()
     llvm_set(INCLUDE_DIRS includedir true)
     llvm_set(ROOT_DIR prefix true)
     llvm_set(ENABLE_ASSERTIONS assertion-mode)
+    llvm_set(HOST_TARGET host-target)
 
     # The LLVM version string _may_ contain a git/svn suffix, so match only the x.y.z part
     string(REGEX MATCH "^[0-9]+[.][0-9]+[.][0-9]+" LLVM_VERSION_BASE_STRING "${LLVM_VERSION_STRING}")

docs/compiler_rt.md

@@ -0,0 +1,155 @@
+# Configuring LDC to use compiler-rt libraries
+
+LDC provides some functionalities like PGO, sanitizers and fuzzing, which require the presence of some libraries that are part of the compiler-rt LLVM sub-project.
+This document aims to describe how to tell LDC the locations of these libraries, based on your installation method.
+It is meant mostly for people using LDC through a Linux package manager or manually building it, which includes package maintainers.
+
+## Using the prebuilt packages or [dlang.org/install.sh](https://dlang.org/install.sh)
+
+The tarballs at https://github.com/ldc-developers/ldc/releases come with the compiler-rt libraries and you don't need to do any configuration.
+The dlang.org install.sh script also uses these tarballs so the same things applies to it.
+
+## Using a Linux distribution's package manager
+
+Given a survey of the available options at the time of writing,
+most distributions don't add a dependency on compiler-rt nor do they configure LDC to find them when installed manually,
+therefore, it is needed to do both of these steps manually.
+
+### Installing compiler-rt
+
+The name of the actual package varies quite a lot across distributions but you can usually find it be searching for `compiler-rt` or `libclang`.
+Below you will find a list of popular Linux distributions and the name of the `compiler-rt` package:
+
+- Debian/Ubuntu: `libclang-rt-dev`
+- Fedora: `compiler-rt`
+- Arch: `compiler-rt`
+- Gentoo: `compiler-rt-sanitizers`
+
+### Adding the compiler-rt path to ldc2.conf
+
+After you've installed the packages chances are that the libraries still won't be found because the path differs from what LDC expects.
+To solve this you need to first determine the path of the libraries.
+Again, this path depends on distribution but it is easy to find if you use your package manager to list the contents of the `compiler-rt` package installed in the previous step.
+
+Usually the path has the form: `<some_directory>/lib/clang/<major_version>/lib/linux/`.
+Where  `<major_version>` is a number like 18, 17, etc.
+`linux` may be, instead, a target triple like `x86_64-redhat-linux-gnu`.
+If the directory you found contains a bunch of `libclang_rt.*` files then you've found the right path, if not, try again.
+
+For simplicity, below you can find the paths of some Linux distributions.
+Remember to adapt them to the appropriate version of the package you have installed.
+
+- Debian/Ubuntu: `/usr/lib/llvm-<major_version>/lib/clang/<major_version>/lib/linux/`
+- Fedora: `/usr/lib/clang/<major_version>/lib/x86_64-redhat-linux-gnu/`
+- Arch: `/usr/lib/clang/<major_version>/lib/linux/`
+- Gentoo: `/usr/lib/clang/<major_version>/lib/linux/`
+
+You now need to edit the ldc2 configuration file.
+Since you're installing ldc2 through your package manager the config file is probably in `/etc/ldc2.conf`.
+If it's not there it should be in `../etc/ldc2.conf` relative to the directory of the ldc2 executable.
+
+Use your favorite text editor to edit the file and jump to the `lib-dirs = ` snippet.
+
+On recent versions you should see:
+```
+    lib-dirs = [
+        "/usr/lib",
+        "/usr/lib/clang/17/lib/linux", // compiler-rt directory
+    ];
+```
+You should edit the line with the `compiler-rt directory` comment and put the path you determined above in there.
+
+On older versions you wouldn't have the second entry so you would only see:
+```
+    lib-dirs = [
+        "/usr/lib",
+    ];
+```
+
+In that case just add another line with the path surrounded  by `"`.
+
+In the end, you should have:
+```
+    lib-dirs = [
+        "/usr/lib",
+		"YOUR_PATH_HERE", // compiler-rt directory
+    ];
+```
+With or without the `compiler-rt` comment.
+
+## Building from source
+
+When building from source you can pass a number of options to cmake related to compiler-rt libraries.
+
+### `COMPILER_RT_BASE_DIR`
+
+This option tells cmake a path that will be transformed, assuming standard layout, in the final compiler-rt directory.
+If you are using a distribution tarball for llvm then the default value for this option, `<LLVM_LIB_DIR>/clang`, should be the correct one.
+
+If on Linux and using the llvm provided through your package manager set this option to something like `/usr/lib/clang`.
+How to find the correct path is described above, in the Linux section.
+
+### `COMPILER_RT_LIBDIR_OS`
+
+This option only applies to non-Mac Unixes and refers to the final directory name in the full path to the compiler-rt libraries.
+
+If the path is `[...]/clang/<version>/lib/linux` then this value should be `linux`.
+If it is `[...]/clang/<version>/lib/x86_64-redhat-linux-gnu` then this value should be `x86_64-redhat-linux-gnu`.
+
+### `LDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH`
+
+The option only applied to non-Mac Unixes and refers to the architecture component in the filename of the libraries.
+It only makes sense specifying this if `LDC_INSTALL_LLVM_RUNTIME_LIBS` is set to `ON`, see below.
+
+If the filename of the libraries is `libclang_rt.asan-x86_64.a` then this value should be `x86_64`.
+If the filename of the libraries is `libclang_rt.asan.a` then this value should be `""` (empty).
+
+### `LDC_INSTALL_LLVM_RUNTIME_LIBS`
+
+This option tells cmake to copy the library files from the compiler-rt directory specified above to the library directory of ldc2.
+If you enable this you don't need to configure anything else, the libraries will be found when you run ldc2.
+
+### `COMPILER_RT_LIBDIR_CONFIG`
+
+The final path that is stored in the configuration file in regards to compiler-rt is `${COMPILER_RT_BASE_DIR}/${LLVM_MAJOR_VERSION}/lib/${COMPILER_RT_LIBDIR_OS}`.
+If this setting doesn't match your layout, as a last resort, you can specify your custom path with `-DCOMPILER_RT_LIBDIR_CONFIG` and that unaltered path will be stored in the config.
+
+## Checking that everything works
+
+Try to compile the empty program below with `ldc2 -fprofile-generate -vv sample.d`
+```d
+void main () {}
+```
+
+And check the end of the output:
+```
+[...]
+*** Linking executable ***
+Searching profile runtime: /usr/lib/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/llvm-17/lib/clang/17/lib/linux/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/llvm-17/lib/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/libclang_rt.profile-x86_64.a
+Searching profile runtime: /usr/lib/llvm-17/lib/clang/17/lib/linux/libclang_rt.profile-x86_64.a
+Found, linking with /usr/lib/llvm-17/lib/clang/17/lib/linux/libclang_rt.profile-x86_64.a
+Linking with:
+[...]
+```
+The import line is `Found, linking with ...`.
+If you see this it means that you configured LDC correctly and the library was found.
+
+If you're missing that line, like in:
+```
+*** Linking executable ***
+Searching profile runtime: /usr/lib/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/llvm-17/lib/libldc_rt.profile.a
+Searching profile runtime: /usr/lib/libclang_rt.profile-x86_64.a
+Searching profile runtime: /usr/lib/libclang_rt.profile-x86_64.a
+Searching profile runtime: /usr/lib/llvm-17/lib/libclang_rt.profile-x86_64.a
+Searching profile runtime: /usr/lib/clang/17.0.6/lib/linux/libclang_rt.profile-x86_64.a
+Searching profile runtime: /usr/lib/clang/17.0.6/lib/linux/libclang_rt.profile-x86_64.a
+Searching profile runtime: /usr/lib/llvm-17/lib/clang/17.0.6/lib/linux/libclang_rt.profile-x86_64.a
+Linking with:
+```
+You should recheck the paths and make the necessary adjustments in the config file until `ldc2` can find it.