diff options
| author | markj <markj@FreeBSD.org> | 2013-11-09 04:38:16 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2013-11-09 04:38:16 +0000 |
| commit | 6f96d8451e5c7928e9fb20cc10c8bf2e5433a02f (patch) | |
| tree | 2a192e5661939e5001ed12192a9b81b2f8379ed4 /cddl/contrib/opensolaris/lib | |
| parent | 629dcaad7dfeefac68bd8612ffb5bdc70fc4b63d (diff) | |
| download | FreeBSD-src-6f96d8451e5c7928e9fb20cc10c8bf2e5433a02f.zip FreeBSD-src-6f96d8451e5c7928e9fb20cc10c8bf2e5433a02f.tar.gz | |
Don't try to use the 32-bit drti.o unless the data model is explicitly set
to ILP32. Otherwise dtrace -G will attempt to use it on amd64 if it can't
determine which data model to use, which happens when -64 is omitted and
no object files are provided, e.g. with
# dtrace -G -n BEGIN
This would result in a linker error, but now works properly.
Also remove an unnecessary #ifdef.
MFC after: 2 weeks
Diffstat (limited to 'cddl/contrib/opensolaris/lib')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c index ee68479..5d72e98 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c @@ -1864,7 +1864,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags, * Arches which default to 64-bit need to explicitly use * the 32-bit library path. */ - int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64); + int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32); #else /* * Arches which are 32-bit only just use the normal @@ -1879,9 +1879,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags, len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; -#if !defined(sun) len *= 2; -#endif cmd = alloca(len); (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, |
