diff options
| author | jhb <jhb@FreeBSD.org> | 2009-01-16 22:16:54 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-01-16 22:16:54 +0000 |
| commit | c8283e83beb733f870ebeed9647b5de69bf22b5d (patch) | |
| tree | 8199c0012eec506499fc4170725f3151d6ec0327 /cddl | |
| parent | 328e77fce90dcb1e5c8b1c9ae2f44f4e478da6c4 (diff) | |
| download | FreeBSD-src-c8283e83beb733f870ebeed9647b5de69bf22b5d.zip FreeBSD-src-c8283e83beb733f870ebeed9647b5de69bf22b5d.tar.gz | |
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
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c index 30377b5..aa78658 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c @@ -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; |
