33c33
< "$FreeBSD: head/sbin/ldconfig/ldconfig.c 126896 2004-03-13 00:11:05Z cperciva $";
---
> "$FreeBSD: head/sbin/ldconfig/ldconfig.c 127250 2004-03-21 01:21:26Z peter $";
65a66,68
> #define _PATH_LD32_HINTS "/var/run/ld32.so.hints"
> #define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints"
>
105c108,109
< int is_aout;
---
> int is_aout = 0;
> int is_32 = 0;
107,115c111,126
< is_aout = 0;
< if (argc > 1 && strcmp(argv[1], "-aout") == 0) {
< is_aout = 1;
< argc--;
< argv++;
< } else if (argc > 1 && strcmp(argv[1], "-elf") == 0) {
< /* skip over legacy -elf arg */
< argc--;
< argv++;
---
> while (argc > 1) {
> if (strcmp(argv[1], "-aout") == 0) {
> is_aout = 1;
> argc--;
> argv++;
> } else if (strcmp(argv[1], "-elf") == 0) {
> is_aout = 0;
> argc--;
> argv++;
> } else if (strcmp(argv[1], "-32") == 0) {
> is_32 = 1;
> argc--;
> argv++;
> } else {
> break;
> }
118c129,132
< hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS;
---
> if (is_32)
> hints_file = is_aout ? _PATH_LD32_HINTS : _PATH_ELF32_HINTS;
> else
> hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS;