From owner-svn-src-stable-7@FreeBSD.ORG  Tue Feb 17 15:54:09 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6C8351065678;
	Tue, 17 Feb 2009 15:54:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 59EA58FC19;
	Tue, 17 Feb 2009 15:54:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1HFs9wt019931;
	Tue, 17 Feb 2009 15:54:09 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1HFs994019930;
	Tue, 17 Feb 2009 15:54:09 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200902171554.n1HFs994019930@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 17 Feb 2009 15:54:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188716 - in stable/7/cddl/contrib/opensolaris: .
	lib/libdtrace/common
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 15:54:10 -0000

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;