Build fixes for LLVM 19

Author: nidefawl

clang/tools/libclang/CIndexer.cpp

@@ -16,7 +16,6 @@
 #include "clang/Basic/Version.h"
 #include "clang/Config/config.h"
 #include "clang/Driver/Driver.h"
-#include "clang/Config/config.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/FileSystem.h"

lld/COFF/DLL.cpp

@@ -705,8 +705,8 @@ void IdataContents::create(COFFLinkerContext &ctx) {
 
     // Remap the dll name
     auto dllName = syms[0]->getDLLName();
-    auto dllMapping = config->dllImportRename.find(dllName);
-    if (dllMapping != config->dllImportRename.end())
+    auto dllMapping = ctx.config.dllImportRename.find(dllName);
+    if (dllMapping != ctx.config.dllImportRename.end())
       dllName = dllMapping->second;
 
     // Create the import table header.
@@ -751,8 +751,8 @@ void DelayLoadContents::create(Defined *h) {
 
     // Remap the dll name
     auto dllName = syms[0]->getDLLName();
-    auto dllMapping = config->dllImportRename.find(dllName);
-    if (dllMapping != config->dllImportRename.end())
+    auto dllMapping = ctx.config.dllImportRename.find(dllName);
+    if (dllMapping != ctx.config.dllImportRename.end())
       dllName = dllMapping->second;
 
     // Create the delay import table header.

lld/MinGW/Driver.cpp

@@ -103,11 +103,6 @@ static void printHelp(const char *argv0) {
       false /*ShowHidden*/, true /*ShowAllAliases*/);
   lld::outs() << "\n";
 }
-namespace lld {
-namespace coff {
-void printHelp(const char *argv0);
-} // namespace coff
-} // namespace lld
 
 static cl::TokenizerCallback getQuotingStyle() {
   if (Triple(sys::getProcessTriple()).getOS() == Triple::Win32)
@@ -195,8 +190,6 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
 
   if (args.hasArg(OPT_help)) {
     printHelp(argsArr[0]);
-    // Also print lld-link help
-    coff::printHelp(argsArr[0]);
     return true;
   }
 

lldb/tools/lldb-dap/lldb-dap.cpp

@@ -1360,7 +1360,6 @@ void request_evaluate(const llvm::json::Object &request) {
     if (frame.IsValid()) {
       g_dap.focus_tid = frame.GetThread().GetThreadID();
     }
-  if (!expression.empty() && (expression[0] == '`' || expression[0] == '/')) {
     auto result =
         RunLLDBCommandsVerbatim(llvm::StringRef(), {std::string(expression)});
     EmplaceSafeString(body, "result", result);

nidefawl/build-linux-x86_64.dockerfile

@@ -6,54 +6,55 @@ RUN apt-get update -yqq
 RUN apt-get install -qqy --no-install-recommends sudo wget gnupg2 ca-certificates
 # add user builder
 RUN useradd -ms /bin/bash builder
+WORKDIR /home/builder
+
 # add user builder to sudoers
 RUN echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-# switch to user builder
-USER builder
-ENV PATH=/opt/cmake/bin:$PATH:/home/builder/.local/bin
-WORKDIR /home/builder
 
-RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-RUN cat /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-RUN sudo bash -c "echo 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' >> /etc/apt/sources.list"
-RUN cat /etc/apt/sources.list
-RUN sudo apt-get update -yqq
-RUN apt search clang
-RUN sudo apt-get install -qqy --no-install-recommends \
+RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+RUN bash -c "echo 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' >> /etc/apt/sources.list"
+RUN apt-get update -yqq
+RUN apt-get install -qqy --no-install-recommends \
     autoconf-archive autopoint build-essential automake bzip2 clang-18 python3  \
     clang-tidy-18 curl e2fslibs-dev file gettext git gnupg2 less libasound2-dev \
     libatomic1 libattr1-dev libbsd-dev libbsd0 libc++-18-dev libc++abi-18-dev   \
     libedit-dev libgtk-3-dev liblzma-dev libncurses-dev libncursesw6 libssl-dev \
     libtinfo6 libtool libunwind-18-dev libx11-dev libxcursor-dev libxi-dev nano \
     libxinerama-dev libxml2 libxrandr-dev libltdl-dev lld-18 nsis pkg-config    \
     python3-dev python3-distutils python3-pip swig unzip unzip yasm wget zip    \
-    rsync
-
-RUN pip3 install pygments pyyaml
+    rsync libclang-rt-18-dev
 
-# enfore lld-18 as linker
-RUN sudo ln -s /usr/bin/lld-18 /usr/local/bin/ld
+    # enfore lld-18 as linker
+RUN ln -s /usr/bin/lld-18 /usr/local/bin/ld
 
 RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.12.0/ninja-linux.zip
-RUN sudo unzip ninja-linux.zip -d /usr/local/bin/ && rm ninja-linux.zip
+RUN unzip ninja-linux.zip -d /usr/local/bin/ && rm ninja-linux.zip
 
 # Manually install a newer version of CMake; this is needed since building
 # LLVM requires CMake 3.13.4, while Ubuntu 18.04 ships with 3.10.2. If
 # updating to a newer distribution, this can be dropped.
 RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3-linux-$(uname -m).tar.gz
 RUN tar -zxf cmake-*.tar.gz && rm cmake-*.tar.gz
-RUN sudo mv cmake-* /opt/cmake && sudo chown -R root:root /opt/cmake
+RUN mv cmake-* /opt/cmake && chown -R root:root /opt/cmake
+
+ENV PATH=/opt/cmake/bin:$PATH:/home/builder/.local/bin
 
 
-RUN sudo git config --global user.name "LLVM MinGW" && \
-    sudo git config --global user.email root@localhost && \
-    sudo git config --global init.defaultBranch main && \
-    sudo git config --global advice.detachedHead false
+RUN git config --global user.name "LLVM MinGW" && \
+    git config --global user.email root@localhost && \
+    git config --global init.defaultBranch main && \
+    git config --global advice.detachedHead false
 
-RUN sudo mkdir -p /build && sudo chown -R builder:builder /build && \
-    mkdir -p /build/llvm
+RUN mkdir -p /build && chown -R builder:builder /build
 
+# switch to user builder
+USER builder
+RUN mkdir -p /build/llvm
 WORKDIR /build/llvm
+    
+RUN pip3 install pygments pyyaml
+        
+
 ARG GIT_REPO=https://github.com/nidefawl/llvm-project.git
 ARG GIT_BRANCH=llvm-dev
 RUN git clone --depth=1 --branch=$GIT_BRANCH --single-branch $GIT_REPO llvm-project
@@ -64,16 +65,3 @@ RUN ./build-linux-x86_64.sh
 
 ENV LD_LIBRARY_PATH=/build/llvm/llvm-linux-x86_64/lib/x86_64-unknown-linux-gnu
 ENV PATH=/build/llvm/llvm-linux-x86_64/bin:$PATH
-
-# steal the local runtimes and provide them for packaging, what is the worst that could happen?
-# in theory this should work
-RUN cp /lib/x86_64-linux-gnu/libc++abi.so.1 /build/llvm/llvm-linux-x86_64/lib && \
-    cp /lib/x86_64-linux-gnu/libc++.so.1 /build/llvm/llvm-linux-x86_64/lib && \
-    cp /lib/x86_64-linux-gnu/libunwind.so.1 /build/llvm/llvm-linux-x86_64/lib
-
-RUN cp /lib/x86_64-linux-gnu/libncurses.so.6 /build/llvm/llvm-linux-x86_64/lib && \
-    cp /lib/x86_64-linux-gnu/libform.so.6 /build/llvm/llvm-linux-x86_64/lib && \
-    cp /lib/x86_64-linux-gnu/libtinfo.so.6 /build/llvm/llvm-linux-x86_64/lib && \
-    cp /lib/x86_64-linux-gnu/libpanel.so.6 /build/llvm/llvm-linux-x86_64/lib
-
-RUN tar -cjSf toolchain.bz2 --transform "s%^llvm-linux-x86_64%llvm-clang-ubuntu-22.04-x86_64%" llvm-linux-x86_64

nidefawl/build-linux-x86_64.sh

@@ -26,11 +26,11 @@ if [ ! -z "$BOOT_TC" ]; then
   export PATH=$BOOT_TC/bin:$PATH
   export LD_LIBRARY_PATH=$BOOT_TC/lib/x86_64-unknown-linux-gnu
 else
-  export CC="clang-16"
-  export CXX="clang++-16"
+  export CC="clang-18"
+  export CXX="clang++-18"
   # use lld if found
   /usr/bin/which "ld.lld" &> /dev/null && {
-    EXTRA_ARGS+="-DLLVM_USE_LINKER=lld-16 "
+    EXTRA_ARGS+="-DLLVM_USE_LINKER=lld-18 "
     EXTRA_ARGS+="-DLLVM_ENABLE_LTO=thin "
   }
 fi
@@ -59,9 +59,9 @@ printf "#include <cstddef>\nint main(){return sizeof(size_t);}" \
   exit 1
 }
 
-CLANG_MAJOR=$(sed -n 's/\s*set(LLVM_VERSION_MAJOR \([0-9]\+\))/\1/p' $LLVM_SRC_PATH/llvm/CMakeLists.txt)
-CLANG_MINOR=$(sed -n 's/\s*set(LLVM_VERSION_MINOR \([0-9]\+\))/\1/p' $LLVM_SRC_PATH/llvm/CMakeLists.txt)
-CLANG_PATCH=$(sed -n 's/\s*set(LLVM_VERSION_PATCH \([0-9]\+\))/\1/p' $LLVM_SRC_PATH/llvm/CMakeLists.txt)
+CLANG_MAJOR=$(sed -n 's/\s*set(LLVM_VERSION_MAJOR \([0-9]\+\))/\1/p' $LLVM_SRC_PATH/cmake/Modules/LLVMVersion.cmake)
+CLANG_MINOR=$(sed -n 's/\s*set(LLVM_VERSION_MINOR \([0-9]\+\))/\1/p' $LLVM_SRC_PATH/cmake/Modules/LLVMVersion.cmake)
+CLANG_PATCH=$(sed -n 's/\s*set(LLVM_VERSION_PATCH \([0-9]\+\))/\1/p' $LLVM_SRC_PATH/cmake/Modules/LLVMVersion.cmake)
 CLANG_VERSION="$CLANG_MAJOR.$CLANG_MINOR.$CLANG_PATCH"
 echo "Building CLANG_VERSION $CLANG_VERSION"
 echo "Building CC $CC"
@@ -79,7 +79,7 @@ set -x
 
 RUN_CMAKE_CONFIG_STEP=true
 BUILD_RUNTIMES=true
-BUILD_LLVM=true 
+BUILD_LLVM=true
 
 # rerunning cmake configure on existing build doesn't work too well
 $RUN_CMAKE_CONFIG_STEP && $BUILD_RUNTIMES && rm -Rf "${BUILDDIR_TOOLCHAIN}/runtimes"
@@ -89,7 +89,7 @@ $RUN_CMAKE_CONFIG_STEP && $BUILD_RUNTIMES && cmake -Wno-dev --warn-uninitialized
     -B${BUILDDIR_TOOLCHAIN}/runtimes-memsan \
     -GNinja \
     -DCMAKE_BUILD_TYPE=Debug \
-	  -DLLVM_USE_SANITIZER=MemoryWithOrigins \
+    -DLLVM_USE_SANITIZER=MemoryWithOrigins \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
     -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}/runtimes-memsan" \
     -DLLVM_DEFAULT_TARGET_TRIPLE="x86_64-unknown-linux-gnu" \
@@ -100,6 +100,9 @@ $RUN_CMAKE_CONFIG_STEP && $BUILD_RUNTIMES && cmake -Wno-dev --warn-uninitialized
     -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxxabi;libcxx" \
     -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
     -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \
+    -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
+    -DCOMPILER_RT_BUILD_BUILTINS=ON \
+    -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=FALSE \
     -DLLVM_ENABLE_LIBCXX=ON \
     -DLIBCXX_ABI_UNSTABLE=ON \
     -DLIBCXX_ENABLE_SHARED=ON \
@@ -143,6 +146,9 @@ $RUN_CMAKE_CONFIG_STEP && $BUILD_RUNTIMES && cmake -Wno-dev --warn-uninitialized
     -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
     -DLIBCXXABI_INCLUDE_TESTS=OFF \
     -DLIBCXXABI_USE_COMPILER_RT=ON \
+    -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
+    -DCOMPILER_RT_BUILD_BUILTINS=ON \
+    -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=FALSE \
     -DSANITIZER_CXX_ABI=libcxxabi \
     -DLLVM_ENABLE_ASSERTIONS=OFF \
     -DLLVM_INCLUDE_DOCS=OFF \
@@ -167,7 +173,7 @@ $RUN_CMAKE_CONFIG_STEP && $BUILD_LLVM && cmake -Wno-dev --warn-uninitialized \
     -DLLVM_HOST_TRIPLE="x86_64-unknown-linux-gnu" \
     -DCMAKE_C_COMPILER_TARGET="x86_64-unknown-linux-gnu" \
     -DCMAKE_CXX_COMPILER_TARGET="x86_64-unknown-linux-gnu" \
-    -DCLANG_RESOURCE_DIR="../" \
+    -DCLANG_RESOURCE_DIR="" \
     -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \
     -DLLVM_ENABLE_PROJECTS="clang;lld;lldb;clang-tools-extra" \
     -DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF \
@@ -195,24 +201,28 @@ $RUN_CMAKE_CONFIG_STEP && $BUILD_LLVM && cmake -Wno-dev --warn-uninitialized \
 $BUILD_LLVM && cmake --build "${BUILDDIR_TOOLCHAIN}/toolchain" --parallel 6 --target llvm-tblgen
 $BUILD_LLVM && cmake --build "${BUILDDIR_TOOLCHAIN}/toolchain" --parallel 9 --target install/strip
 
-cd $INSTALL_PREFIX
-# There is no way to configure the install directory for these headers
-# so we move them manully
-if [ $BUILD_LLVM ] && [ -d "lib/clang/$CLANG_VERSION/include" ]; then
-  rsync -va lib/clang/$CLANG_VERSION/include/ include/
-  rm -Rf lib/clang
-fi
-if [ $BUILD_LLVM ] && [ -d "lib/clang/$CLANG_MAJOR/include" ]; then
-  rsync -va lib/clang/$CLANG_MAJOR/include/ include/
-  rm -Rf lib/clang
+# the install prefix for the compiler-rt builtin .a files is not correct
+# fix it manually for now
+if [ -d "${INSTALL_PREFIX}/lib/clang/19" ]; then
+  pushd "${INSTALL_PREFIX}/lib/clang/19"
+  if [ ! -d lib ]; then
+    mkdir lib
+    pushd lib
+    ln -s ../../../x86_64-unknown-linux-gnu
+    popd
+  fi
+  popd
 fi
 
-# Now use the newly built libs for the compiler itself. 
-# They are ABI compatible if this is a stage 2 build
-# cd lib
-# # rm libc++*
-# # rm libunwind*
-# rsync -va $BOOT_TC/lib/x86_64-unknown-linux-gnu/libc++.so.2 .
-# rsync -va $BOOT_TC/lib/x86_64-unknown-linux-gnu/libc++abi.so.1
-# cd ..
-# cd ..
+# steal the local runtimes and provide them for packaging, what is the worst that could happen?
+# in theory this should work
+cp /lib/x86_64-linux-gnu/libc++abi.so.1 /build/llvm/llvm-linux-x86_64/lib && \
+    cp /lib/x86_64-linux-gnu/libc++.so.1 /build/llvm/llvm-linux-x86_64/lib && \
+    cp /lib/x86_64-linux-gnu/libunwind.so.1 /build/llvm/llvm-linux-x86_64/lib
+
+cp /lib/x86_64-linux-gnu/libncurses.so.6 /build/llvm/llvm-linux-x86_64/lib && \
+    cp /lib/x86_64-linux-gnu/libform.so.6 /build/llvm/llvm-linux-x86_64/lib && \
+    cp /lib/x86_64-linux-gnu/libtinfo.so.6 /build/llvm/llvm-linux-x86_64/lib && \
+    cp /lib/x86_64-linux-gnu/libpanel.so.6 /build/llvm/llvm-linux-x86_64/lib
+
+tar -cjSf toolchain.bz2 --transform "s%^llvm-linux-x86_64%llvm-clang-${CLANG_VERSION}-ubuntu-22.04-x86_64%" llvm-linux-x86_64