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

Remove sparc64 specific parts of rtld-elf.

Browse Source
This commit is contained in:
Warner Losh 2020-02-26 18:49:25 +00:00
parent 47e9f42ea3
commit 8e0ff10d4b
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,12 +73,6 @@ _libc_other_objects+=syncicache
.if ${MACHINE_ARCH:Mmipsn32*} == "" && ${MACHINE_ARCH:Mmips64*} == ""
_libc_other_objects+=umoddi3 udivdi3 qdivrem
.endif
.elif ${LIBC_ARCH} == "sparc64"
# reloc.c uses __sparc_utrap which needs a lot of other object files
_libc_other_objects+=__sparc_utrap __sparc_utrap_fp_disabled __sparc_utrap_gen \
__sparc_utrap_setup __sparc_utrap_align __sparc_utrap_emul kill getpid \
fpu fpu_explode fpu_div fpu_reg fpu_sqrt fpu_implode fpu_subr fpu_add \
fpu_compare fpu_mul
.endif
# Extract all the .o files from libc_nossp_pic.a. This ensures that

2
libexec/rtld-elf/rtld.c
View File

@ -4954,7 +4954,7 @@ free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused)
#endif
#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__)
#if defined(__i386__) || defined(__amd64__)
/*
* Allocate Static TLS using the Variant II method.

9
libexec/rtld-elf/rtld_tls.h
View File

@ -43,11 +43,10 @@
* block is returned by this function. For architectures using
* 'Variant I' TLS, the thread local storage follows the TCB, and for
* 'Variant II', the thread local storage precedes it. For
* architectures using the 'Variant II' model (e.g. i386, amd64,
* sparc64), the TCB must begin with two pointer fields which are used
* by rtld for its TLS implementation. For the 'Variant I' model, the
* TCB must begin with a single pointer field for rtld's
* implementation.
* architectures using the 'Variant II' model (e.g. i386, amd64) the
* TCB must begin with two pointer fields which are used by rtld for
* its TLS implementation. For the 'Variant I' model, the TCB must
* begin with a single pointer field for rtld's implementation.
*
* If the value of 'oldtls' is non-NULL, the new TLS block will be
* initialised using the values contained in 'oldtls' and 'oldtls'