d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "rtld-elf: link udivmoddi4 from compiler_rt"

Browse Source 
This reverts commit bce2cff0bc.

Revert D27665 in favor of a more general fix coming in D27736.
This commit is contained in:
Ryan Libby 2020-12-28 00:44:25 -08:00
parent a723bb667e
commit 85b8932d0a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libexec/rtld-elf/rtld-libc/Makefile.inc
View File

@ -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