diff options
author | Ryan Libby <rlibby@FreeBSD.org> | 2020-12-28 08:44:25 +0000 |
---|---|---|
committer | Ryan Libby <rlibby@FreeBSD.org> | 2020-12-28 08:44:25 +0000 |
commit | 85b8932d0a9a2f3a1e8db26892e863cd8dbc0846 (patch) | |
tree | 6a2148f86d9e3fe092462a8797deca0e72c6b02c | |
parent | a723bb667e48b9ec55c3a262c9cc49e700e52989 (diff) | |
download | src-85b8932d0a9a2f3a1e8db26892e863cd8dbc0846.tar.gz src-85b8932d0a9a2f3a1e8db26892e863cd8dbc0846.zip |
Revert "rtld-elf: link udivmoddi4 from compiler_rt"
This reverts commit bce2cff0bc0ee3ab5b7a66c19920e7cfe3400f6f.
Revert D27665 in favor of a more general fix coming in D27736.
-rw-r--r-- | libexec/rtld-elf/rtld-libc/Makefile.inc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index e0d05d194401..88f13c8db8cb 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -51,12 +51,8 @@ _libc_other_objects= sigsetjmp lstat stat fstat fstatat fstatfs syscall \ getdirentries _getdirentries _close _fcntl _open _openat _read \ _sigprocmask _write readlink __realpathat _setjmp setjmp setjmperr -# Allow building files from libcompiler_rt. Beware, there are some name -# collisions between libcompiler_rt files and libc files. -CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins -.PATH: ${CRTSRC} -# Finally add additional architecture-dependent dependencies +# Finally add additional architecture-dependent libc dependencies .if ${LIBC_ARCH} == "arm" # ARM needs aeabi_unwind_cpp for _setjmp _libc_other_objects+=aeabi_unwind_cpp @@ -64,7 +60,6 @@ _libc_other_objects+=aeabi_unwind_cpp # __udivdi3 is needed by kvprintf() in rtld_printf.c # i386 also needs i386_set_gsbase for allocate_initial_tls() _libc_other_objects+=umoddi3 udivdi3 qdivrem i386_set_gsbase -SRCS+= udivmoddi4.c .elif ${LIBC_ARCH} == "powerpc" || ${LIBC_ARCH} == "powerpcspe" # ppc needs __syncicache for reloc.c and __umoddi3+__udivdi3 for rtld_printf.c _libc_other_objects+=syncicache umoddi3 udivdi3 qdivrem |