svn commit: r187347 - head/cddl/contrib/opensolaris/lib/libdtrace/common

[John Baldwin]

Author: jhb
Date: Fri Jan 16 22:16:54 2009
New Revision: 187347
URL: http://svn.freebsd.org/changeset/base/187347

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

Modified:
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Jan 16 20:51:03 2009	(r187346)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Jan 16 22:16:54 2009	(r187347)
@@ -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;