Skip to content

libnone: include builtins from compiler-rt #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yotann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libnone: include builtins from compiler-rt #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions libs/none/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 0 additions & 5 deletions libs/none/merge.ar.in
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions test/lit/libcall.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}