From owner-svn-src-head@FreeBSD.ORG  Thu Nov 10 21:07:15 2011
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 815ED106568A;
	Thu, 10 Nov 2011 21:07:15 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 717688FC18;
	Thu, 10 Nov 2011 21:07:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAAL7FSR056378;
	Thu, 10 Nov 2011 21:07:15 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAAL7Fsw056376;
	Thu, 10 Nov 2011 21:07:15 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201111102107.pAAL7Fsw056376@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Thu, 10 Nov 2011 21:07:15 +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: r227429 - head/usr.sbin/config
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: Thu, 10 Nov 2011 21:07:15 -0000

Author: rstone
Date: Thu Nov 10 21:07:14 2011
New Revision: 227429
URL: http://svn.freebsd.org/changeset/base/227429

Log:
  The generated Makefile for the kernel was not running ctfconvert on
  object files corresponding to source files that had the compile-with
  option set in conf/files.  This means that any fbt probes for functions
  in that object file would not have correct argument types.
  
  The fix is to run ctfconvert on any target file that does not have the
  no-obj option set in files.
  
  PR:		bin/160275
  Reported by:	Paul Ambrose (ambrosehua AT gmail DOT com)
  MFC after:	1 week

Modified:
  head/usr.sbin/config/mkmakefile.c

Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c	Thu Nov 10 20:28:30 2011	(r227428)
+++ head/usr.sbin/config/mkmakefile.c	Thu Nov 10 21:07:14 2011	(r227429)
@@ -762,16 +762,21 @@ do_rules(FILE *f)
 				break;
 			}
 			snprintf(cmd, sizeof(cmd),
-			    "${%s_%c%s}\n\t@${NORMAL_CTFCONVERT}", ftype,
+			    "${%s_%c%s}\n", ftype,
 			    toupper(och),
 			    ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
 			compilewith = cmd;
 		}
 		*cp = och;
 		if (strlen(ftp->f_objprefix))
-			fprintf(f, "\t%s $S/%s\n\n", compilewith, np);
+			fprintf(f, "\t%s $S/%s\n", compilewith, np);
 		else
-			fprintf(f, "\t%s\n\n", compilewith);
+			fprintf(f, "\t%s\n", compilewith);
+
+		if (!(ftp->f_flags & NO_OBJ))
+			fprintf(f, "\t@${NORMAL_CTFCONVERT}\n\n");
+		else
+			fprintf(f, "\n");
 	}
 }