From owner-svn-src-head@freebsd.org Tue Jun 23 15:36:06 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 6502E33080C; Tue, 23 Jun 2020 15:36:06 +0000 (UTC) (envelope-from emaste@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49rr3B1vPmz3SdV; Tue, 23 Jun 2020 15:36:06 +0000 (UTC) (envelope-from emaste@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 382D522B9C; Tue, 23 Jun 2020 15:36:06 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05NFa6bM016738; Tue, 23 Jun 2020 15:36:06 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05NFa67D016737; Tue, 23 Jun 2020 15:36:06 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006231536.05NFa67D016737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 23 Jun 2020 15:36:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362543 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 362543 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.33 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: Tue, 23 Jun 2020 15:36:06 -0000 Author: emaste Date: Tue Jun 23 15:36:05 2020 New Revision: 362543 URL: https://svnweb.freebsd.org/changeset/base/362543 Log: ldconfig: remove i386 aout invocation aout support in ldconfig hasn't been required since FreeBSD 2.x. Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 ldconfig to generate aout ldconfig hints. Reviewed by: dim, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24883 Modified: head/libexec/rc/rc.d/ldconfig Modified: head/libexec/rc/rc.d/ldconfig ============================================================================== --- head/libexec/rc/rc.d/ldconfig Tue Jun 23 15:32:05 2020 (r362542) +++ head/libexec/rc/rc.d/ldconfig Tue Jun 23 15:36:05 2020 (r362543) @@ -85,22 +85,6 @@ ldconfig_start() ${ldconfig} -soft ${_ins} ${_LDC} ;; esac - - # Legacy aout support for i386 only - case ${machine_arch} in - i386) - # Default the a.out ldconfig path. - : ${ldconfig_paths_aout=${ldconfig_paths}} - _LDC="" - for i in /usr/lib/aout ${ldconfig_paths_aout} /etc/ld.so.conf; do - if [ -r "${i}" ]; then - _LDC="${_LDC} ${i}" - fi - done - check_startmsgs && echo 'a.out ldconfig path:' ${_LDC} - ${ldconfig} -aout ${_ins} ${_LDC} - ;; - esac fi }