From owner-svn-src-head@FreeBSD.ORG  Fri Jan 16 22:16:54 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A91410656FF;
	Fri, 16 Jan 2009 22:16:54 +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 795FC8FC0C;
	Fri, 16 Jan 2009 22:16:54 +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 n0GMGsYO020060;
	Fri, 16 Jan 2009 22:16:54 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0GMGsWW020059;
	Fri, 16 Jan 2009 22:16:54 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200901162216.n0GMGsWW020059@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 16 Jan 2009 22:16:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187347 -
	head/cddl/contrib/opensolaris/lib/libdtrace/common
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2009 22:16:55 -0000

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;