From d673ce17035be212de8bb118379162e437bcf5c2 Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 26 Feb 2020 18:49:25 +0000 Subject: [PATCH] Remove sparc64 specific parts of rtld-elf. --- libexec/rtld-elf/rtld-libc/Makefile.inc | 6 ------ libexec/rtld-elf/rtld.c | 2 +- libexec/rtld-elf/rtld_tls.h | 9 ++++----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index 9d56e58dfc8..2134c1e6f09 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -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 diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index b2c2f1f2876..61015ac077c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -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. diff --git a/libexec/rtld-elf/rtld_tls.h b/libexec/rtld-elf/rtld_tls.h index 67b01fb6be6..e150ad7f261 100644 --- a/libexec/rtld-elf/rtld_tls.h +++ b/libexec/rtld-elf/rtld_tls.h @@ -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' -- 2.45.0