The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b7cc20f7975342f0eb47c8731341e1bc7827e9d
commit 8b7cc20f7975342f0eb47c8731341e1bc7827e9d Author: Warner Losh <[email protected]> AuthorDate: 2022-01-07 05:41:38 +0000 Commit: Warner Losh <[email protected]> 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;
