Date: Thu, 08 Apr 2010 15:12:13 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: netchild@FreeBSD.org 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 Message-ID: <20100408.151213.718265677801106795.imp@bsdimp.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <20100407100015.117169nw2iu6xp4w@webmail.leidinger.net>
Alexander Leidinger <netchild@freebsd.org> writes:
: Quoting "M. Warner Losh" <imp@bsdimp.com> (from Tue, 06 Apr 2010
: 10:54:17 -0600 (MDT)):
:
: > In message: <20100405181450.13494itjj2ehj5og@webmail.leidinger.net>
: > Alexander Leidinger <netchild@FreeBSD.org> 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
:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100408.151213.718265677801106795.imp>