From nobody Fri Jan 07 05:46:54 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CABC81935A78; Fri, 7 Jan 2022 05:46:56 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVXKW33sKz3tCv; Fri, 7 Jan 2022 05:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B75EE2DDA2; Fri, 7 Jan 2022 05:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2075ksoE007386; Fri, 7 Jan 2022 05:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2075ks0E007385; Fri, 7 Jan 2022 05:46:54 GMT (envelope-from git) Date: Fri, 7 Jan 2022 05:46:54 GMT Message-Id: <202201070546.2075ks0E007385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8b7cc20f7975 - main - ldconfig: remove libsoft support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b7cc20f7975342f0eb47c8731341e1bc7827e9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641534416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DbDmHh0skKNZ1hQtkYgrriXcyj/0TkM2eayKVIJeFg=; b=TY0Jr++H30e03BVVEaHFyPHaa9WCjk0W0Iz5EQK061Qgh25XhgxvhikGoDti/eP4u2tA1I iFqbOUt5nzaYtDpKInzlnKQF6/I7hZT9oyV9n3HApNX5PotPEu2M3CMHs+4HVqLpaiha+n X4gN94V6dSLNXpiJVkv+eFGACHRyeMrktAfjLXsfu1BaIJl7GHeskyZX/aS5lz8D/Dk6ul yWSGJqIpQBJNFjZIDMg3RfIJoYRwz2YVtrSGpRFAKPDVs4CVM2w2ERz4w4iF2CCv4vXNVS EYVRRwZEpjTjp/f8YgNQuXPsnr1ZZiWihpA/YgzzvDo62NvKSNAML9Gby0fZ0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641534416; a=rsa-sha256; cv=none; b=jeRyP6D7Fa/XAItNbHui7orRxEfF9CZq5F2+z3qt6wg+bppKdC77MkdR3L4w3mqguED1Jh Ds2CDjCpTNIxlB1ozOVeaQ12kIFNBZoRP6snci+1H5Mm5G/BWhTOI+2/H5QsC5h3XgS57d /Wt75izLjGsTwSVv//3GkpokhZzzr6w2dwb8mSW1CIy8iQLIpZz7ZGqjdaf1+uBjpeOBUR dfFeRA8F2O6ikXT8lkYk5Pq2NUDRiHqfqrlQ0N0BIS3qATkDNuHDzqN82m2LR51CaRetfD tu5KikkxpsatJLG+ME3CtPEXGr1+mhZhm7X6GvWRjT3o7yk6s6vxVNqxb7SpAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b7cc20f7975342f0eb47c8731341e1bc7827e9d commit 8b7cc20f7975342f0eb47c8731341e1bc7827e9d Author: Warner Losh AuthorDate: 2022-01-07 05:41:38 +0000 Commit: Warner Losh CommitDate: 2022-01-07 05:44:07 +0000 ldconfig: remove libsoft support Remove support for -soft and its implementation. This arg was never documented, so no need to remove it from the man page. Sponsored by: Netflix --- sbin/ldconfig/ldconfig.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index b039412a648b..a045f0523a6a 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -52,7 +52,6 @@ #define _PATH_LD32_HINTS "/var/run/ld32.so.hints" #define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" -#define _PATH_ELFSOFT_HINTS "/var/run/ld-elf-soft.so.hints" static void usage(void); @@ -61,9 +60,9 @@ main(int argc, char **argv) { const char *hints_file; int c; - bool is_32, is_soft, justread, merge, rescan, verbose; + bool is_32, justread, merge, rescan, verbose; - is_32 = is_soft = justread = merge = rescan = verbose = false; + is_32 = justread = merge = rescan = verbose = false; while (argc > 1) { if (strcmp(argv[1], "-aout") == 0) { @@ -75,18 +74,12 @@ main(int argc, char **argv) is_32 = true; argc--; argv++; - } else if (strcmp(argv[1], "-soft") == 0) { - is_soft = true; - argc--; - argv++; } else { break; } } - if (is_soft) - hints_file = _PATH_SOFT_ELF_HINTS; - else if (is_32) + if (is_32) hints_file = _PATH_ELF32_HINTS; else hints_file = _PATH_ELF_HINTS;