[flang][AArch64] Always link compiler-rt to flang after libgcc (#144710)

This patch fixes an issue where the __trampoline_setup symbol is missing with some programs compiled with flang. This symbol is present only in compiler-rt and not in libgcc. This patch adds compiler-rt to the link line after libgcc if libgcc is being used, so that only this symbol will be picked from compiler-rt. Fixes #141147

Author: DavidTruby

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -2252,6 +2252,13 @@ static void AddLibgcc(const ToolChain &TC, const Driver &D,
  if (LGT == LibGccType::SharedLibGcc ||
  (LGT == LibGccType::UnspecifiedLibGcc && D.CCCIsCXX()))
  CmdArgs.push_back("-lgcc");
+ // compiler-rt is needed after libgcc for flang on AArch64 for the
+ // __trampoline_setup symbol
+ if (D.IsFlangMode() && TC.getArch() == llvm::Triple::aarch64) {
+ CmdArgs.push_back("--as-needed");
+ CmdArgs.push_back(TC.getCompilerRTArgString(Args, "builtins"));
+ CmdArgs.push_back("--no-as-needed");
+ }
 }
 
 void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D,

flang/test/Driver/flang-ld-aarch64.f90

@@ -0,0 +1,9 @@
+! Check linker flags for AArch64 linux, since it needs both libgcc and 
+! compiler-rt, with compiler-rt second when -rtlib=libgcc.
+
+! RUN: %flang -### -rtlib=libgcc --target=aarch64-linux-gnu %S/Inputs/hello.f90 2>&1 | FileCheck %s
+
+! CHECK-LABEL: "{{.*}}ld{{(\.exe)?}}"
+! CHECK-SAME: "-lflang_rt.runtime" "-lm"
+! CHECK-SAME: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
+! CHECK-SAME: "--as-needed" "{{.*}}{{\\|/}}libclang_rt.builtins.a" "--no-as-needed"

llvm/CMakeLists.txt

@@ -653,6 +653,13 @@ if(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD STREQUAL "all")
  set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ${LLVM_ALL_EXPERIMENTAL_TARGETS})
 endif()
 
+if("flang" IN_LIST LLVM_ENABLE_PROJECTS AND 
+ "AArch64" IN_LIST LLVM_TARGETS_TO_BUILD AND
+ NOT ("compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES OR "compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS))
+ message(STATUS "Enabling compiler-rt as a dependency of Flang")
+ list(APPEND LLVM_ENABLE_RUNTIMES "compiler-rt")
+endif()
+
 set(LLVM_TARGETS_TO_BUILD
  ${LLVM_TARGETS_TO_BUILD}
  ${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD})