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
This commit is contained in:
parent
d418bc27e6
commit
8b7cc20f79
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user