Correct the sense of the "use32" terenary operator so that it uses

'lib32' for 32-bit binaries on amd64 and 'lib' for 64-bit binaries.
Remove an #ifdef __i386__ that defined use32 to the wrong value on
i386 to workaround the bug in the terenary operator.

MFC after:	1 month
This commit is contained in:
John Baldwin 2009-01-16 22:16:54 +00:00
parent 5e36f05822
commit 1149b79dac
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=187347

View File

@ -1739,15 +1739,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
* Arches which are 32-bit only just use the normal
* library path.
*/
#if defined(__i386__)
int use_32 = 1; /* use /usr/lib/... -sson */
#else
int use_32 = 0;
#endif
#endif
(void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o",
use_32 ? "":"32");
use_32 ? "32":"");
len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
drti) + 1;