From owner-svn-src-head@freebsd.org Wed Feb 26 18:49:30 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ACA73240856; Wed, 26 Feb 2020 18:49:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48SPwm1brDz3LQb; Wed, 26 Feb 2020 18:49:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC4CF40C3; Wed, 26 Feb 2020 18:49:26 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01QInQrj034438; Wed, 26 Feb 2020 18:49:26 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01QInQxa034434; Wed, 26 Feb 2020 18:49:26 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202002261849.01QInQxa034434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 26 Feb 2020 18:49:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358346 - in head/libexec/rtld-elf: . rtld-libc X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/libexec/rtld-elf: . rtld-libc X-SVN-Commit-Revision: 358346 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2020 18:49:30 -0000 Author: imp Date: Wed Feb 26 18:49:25 2020 New Revision: 358346 URL: https://svnweb.freebsd.org/changeset/base/358346 Log: Remove sparc64 specific parts of rtld-elf. Modified: head/libexec/rtld-elf/rtld-libc/Makefile.inc head/libexec/rtld-elf/rtld.c head/libexec/rtld-elf/rtld_tls.h Modified: head/libexec/rtld-elf/rtld-libc/Makefile.inc ============================================================================== --- head/libexec/rtld-elf/rtld-libc/Makefile.inc Wed Feb 26 18:49:20 2020 (r358345) +++ head/libexec/rtld-elf/rtld-libc/Makefile.inc Wed Feb 26 18:49:25 2020 (r358346) @@ -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 Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Wed Feb 26 18:49:20 2020 (r358345) +++ head/libexec/rtld-elf/rtld.c Wed Feb 26 18:49:25 2020 (r358346) @@ -4954,7 +4954,7 @@ free_tls(void *tcb, size_t tcbsize, size_t tcbalign __ #endif -#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) +#if defined(__i386__) || defined(__amd64__) /* * Allocate Static TLS using the Variant II method. Modified: head/libexec/rtld-elf/rtld_tls.h ============================================================================== --- head/libexec/rtld-elf/rtld_tls.h Wed Feb 26 18:49:20 2020 (r358345) +++ head/libexec/rtld-elf/rtld_tls.h Wed Feb 26 18:49:25 2020 (r358346) @@ -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'