From owner-svn-src-all@FreeBSD.ORG Thu Apr 8 21:18:47 2010 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FCEF106564A; Thu, 8 Apr 2010 21:18:47 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id B35A28FC1D; Thu, 8 Apr 2010 21:18:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o38LC9bk051979; Thu, 8 Apr 2010 15:12:09 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 08 Apr 2010 15:12:13 -0600 (MDT) Message-Id: <20100408.151213.718265677801106795.imp@bsdimp.com> To: netchild@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <20100407100015.117169nw2iu6xp4w@webmail.leidinger.net> References: <20100405181450.13494itjj2ehj5og@webmail.leidinger.net> <20100406.105417.934842008305588111.imp@bsdimp.com> <20100407100015.117169nw2iu6xp4w@webmail.leidinger.net> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: kostikbel@gmail.com, svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2010 21:18:47 -0000 In message: <20100407100015.117169nw2iu6xp4w@webmail.leidinger.net> Alexander Leidinger writes: : Quoting "M. Warner Losh" (from Tue, 06 Apr 2010 : 10:54:17 -0600 (MDT)): : : > In message: <20100405181450.13494itjj2ehj5og@webmail.leidinger.net> : > Alexander Leidinger writes: : > : Warner, do you mind if I back-out r206082 and change the place where : > : NORMAL_CTFCONVERT is used instead (fist I have to search for it : > : again... not today)? It would make it consistent with all other : > places : > : (SYSTEM_CTFCONVERT and the plain test and use of CTFxxx). : > : > Go ahead. I just did the fast and dirty fix. I though it was : > consistent with how other things were done, but if not, feel free to : > correct it. Also, see bde's commentary :) : : I can not find it, can you please forward it to me? Will do. : Here is what I have ATM (copy&paste, so tabs are probably mangled): : ---snip--- : Index: usr.sbin/config/mkmakefile.c : =================================================================== : --- usr.sbin/config/mkmakefile.c (revision 206031) : +++ usr.sbin/config/mkmakefile.c (working copy) : @@ -741,7 +741,7 @@ : printf("config: don't know rules for %s\n", : np); break; : } : - snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if : - defined(NORMAL_CTFCONVERT) && : - !empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", : - ftype, : + snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t@${NORMAL_CTFCONVERT}", : ftype, : toupper(och), : ftp->f_flags & NOWERROR ? "_NOWERROR" : ""); : compilewith = cmd; Uggg, this should have never been put into mkmakefile.c in the first place. I'm concerned that a change like this will have bad effects for people that have cross-threaded config and kernels. :( However, go ahead and fix it. I worry about people with cross-threaded kernels, but that won't be a huge deal, I don't think. Please monitor the lists to make sure... Warner : Index: sys/conf/kern.pre.mk : =================================================================== : --- sys/conf/kern.pre.mk (revision 206248) : +++ sys/conf/kern.pre.mk (working copy) : @@ -128,7 +128,7 @@ : NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \ : ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c : : -NORMAL_CTFCONVERT= @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || : -${CTFCONVERT} ${CTFFLAGS} ${.TARGET} : +NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || : ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} : : NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} : : ---snip--- : : Bye, : Alexander. : : -- : http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 : http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 : Look before you leap. : -- Samuel Butler :