svn commit: r188716 - in stable/7/cddl/contrib/opensolaris: . lib/libdtrace/common

John Baldwin jhb at FreeBSD.org
Tue Feb 17 07:54:10 PST 2009


Author: jhb
Date: Tue Feb 17 15:54:09 2009
New Revision: 188716
URL: http://svn.freebsd.org/changeset/base/188716

Log:
  MFC:  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.

Modified:
  stable/7/cddl/contrib/opensolaris/   (props changed)
  stable/7/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c

Modified: stable/7/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- stable/7/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Tue Feb 17 15:47:13 2009	(r188715)
+++ stable/7/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Tue Feb 17 15:54:09 2009	(r188716)
@@ -1739,15 +1739,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		 * 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;


More information about the svn-src-stable-7 mailing list