From 0a1c7af2c34632c9d80ebb3113a05cd4f6a511c7 Mon Sep 17 00:00:00 2001
From: Sean Bartell <smbarte2@illinois.edu>
Date: Wed, 4 Dec 2019 14:55:49 -0600
Subject: [PATCH] libnone: include builtins from compiler-rt

These include libcall functions like __umodti3(). LLVM's backends may
generate calls to these functions even when they weren't used by the
original bitcode.
---
 libs/none/CMakeLists.txt | 27 ++++++++++++++++++++++++---
 libs/none/merge.ar.in    |  5 -----
 test/lit/libcall.ll      | 18 ++++++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)
 delete mode 100644 libs/none/merge.ar.in
 create mode 100644 test/lit/libcall.ll

diff --git a/libs/none/CMakeLists.txt b/libs/none/CMakeLists.txt
index 4bcb6a1c..06046ec3 100644
--- a/libs/none/CMakeLists.txt
+++ b/libs/none/CMakeLists.txt
@@ -71,18 +71,39 @@ add_custom_command(OUTPUT ${MUSL}/lib/libc.a
 add_custom_target(musl DEPENDS ${MUSL}/lib/libc.a)
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${MUSL}")
 
-# Compile our little assembly bits into a library, then merge in musl's libc.a.
+# Find the compiler-rt builtins library.
+find_library(COMPILER_RT_BUILTINS
+  NAMES libclang_rt.builtins-x86_64.a
+  PATH_SUFFIXES linux clang/${LLVM_PACKAGE_VERSION}/lib/linux
+)
+if(NOT COMPILER_RT_BUILTINS)
+  message(WARNING "compiler-rt library not found; certain allexes may fail to link")
+endif()
+
+# Compile our little assembly bits into a library, then merge in musl's libc.a
+# and compiler-rt's builtins.
+
 add_library(none STATIC unwind/UnwindRegistersRestore.S unwind/UnwindRegistersSave.S dso_handle.S dynamic.S)
 install(TARGETS none DESTINATION lib)
 set_output_directory(none BINARY_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR} LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
 add_dependencies(none musl)
+
 # http://stackoverflow.com/questions/3821916/how-to-merge-two-ar-static-libraries-into-one
-configure_file(merge.ar.in merge.ar)
+set(merge_ar_path ${CMAKE_CURRENT_BINARY_DIR}/merge.ar)
+file(WRITE ${merge_ar_path}
+  "create libnone.a.merged\n"
+  "addlib ${LLVM_LIBRARY_OUTPUT_INTDIR}/libnone.a\n"
+  "addlib ${MUSL}/lib/libc.a\n"
+)
+if(COMPILER_RT_BUILTINS)
+  file(APPEND ${merge_ar_path} "addlib ${COMPILER_RT_BUILTINS}\n")
+endif()
+file(APPEND ${merge_ar_path} "save\nend\n")
+
 add_custom_command(TARGET none POST_BUILD
   COMMAND ${CMAKE_AR} -M <merge.ar
   COMMAND mv libnone.a.merged ${LLVM_LIBRARY_OUTPUT_INTDIR}/libnone.a
   COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded ${LLVM_LIBRARY_OUTPUT_INTDIR}/libnone.a
-  DEPENDS merge.ar
 )
 
 # Install crt bits from musl, since they are useful for static linking.
diff --git a/libs/none/merge.ar.in b/libs/none/merge.ar.in
deleted file mode 100644
index babbb2ff..00000000
--- a/libs/none/merge.ar.in
+++ /dev/null
@@ -1,5 +0,0 @@
-create libnone.a.merged
-addlib ${LLVM_LIBRARY_OUTPUT_INTDIR}/libnone.a
-addlib ${MUSL}/lib/libc.a
-save
-end
diff --git a/test/lit/libcall.ll b/test/lit/libcall.ll
new file mode 100644
index 00000000..ff24c642
--- /dev/null
+++ b/test/lit/libcall.ll
@@ -0,0 +1,18 @@
+; RUN: llvm-as %s -o %t.bc
+; RUN: bc2allvm %t.bc -o %t
+; RUN: ALLVM_CACHE_DIR=%t-cache allready %t
+; RUN: ALLVM_CACHE_DIR=%t-jit alley %t 0000000000000000
+; RUN: ALLVM_CACHE_DIR=%t-static alley -force-static %t 0000000000000000
+
+; Calculates a 128-bit modulo, which on x86-64 becomes a call to the function
+; __umodti3() in compiler-rt.
+
+define i32 @main(i32, i8**) {
+  %3 = getelementptr i8*, i8** %1, i64 1
+  %4 = load i8*, i8** %3
+  %5 = bitcast i8* %4 to i128*
+  %6 = load i128, i128* %5
+  %7 = urem i128 %6, 3
+  %8 = trunc i128 %7 to i32
+  ret i32 %8
+}