cvs commit: src/share/mk bsd.cpu.mk bsd.dep.mk bsd.lib.mk bsd.sys.mk src/sys/conf files kern.mk kern.pre.mk kmod.mk src/sys/dev/aic7xxx/aicasm Makefile

[Ruslan Ermilov]

On Fri, Mar 12, 2004 at 01:36:12PM -0800, Tom Rhodes wrote:

> Index: src/share/mk/bsd.cpu.mk
> diff -u src/share/mk/bsd.cpu.mk:1.33 src/share/mk/bsd.cpu.mk:1.34
> --- src/share/mk/bsd.cpu.mk:1.33	Fri Mar  5 07:59:33 2004
> +++ src/share/mk/bsd.cpu.mk	Fri Mar 12 13:36:12 2004
> @@ -44,26 +44,38 @@
>  
>  . if ${MACHINE_ARCH} == "i386"
>  .  if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
> -    ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird" || \
> -    ${CPUTYPE} == "athlon"
> +    ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird"
> +_ICC_CPUCFLAGS = -tpp6 -xiMK
>  _CPUCFLAGS = -march=${CPUTYPE}
> +.  elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon"
> +_CPUCFLAGS = -march=${CPUTYPE}
> +_ICC_CPUCFLAGS = -tpp6 -xiM
> 
"athlon-tbird" is now in two conditional sections, please fix.

> Index: src/share/mk/bsd.lib.mk
> diff -u src/share/mk/bsd.lib.mk:1.156 src/share/mk/bsd.lib.mk:1.157
> --- src/share/mk/bsd.lib.mk:1.156	Tue Jan 27 15:22:15 2004
> +++ src/share/mk/bsd.lib.mk	Fri Mar 12 13:36:12 2004
[...]
> +.c.o:
> +	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
> +
> 
Please revert the addition of this, it's bogus and duplicated
what's already in sys.mk.

> @@ -157,7 +166,7 @@
>  	${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
>  .endif
>  
> -.endif !defined(INTERNALLIB)
> +.endif #!defined(INTERNALLIB)
>  
Please revert this.

> Index: src/sys/conf/kern.pre.mk
>  .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
> +. if ${CC} == "icc"
> +CFLAGS+=	-DGPROF
> +. else
>  CFLAGS+=	-DGPROF -falign-functions=16
> +. endif
> 
This can be written better, by having only one -DGPROF for all
compilers, and adding -falign-functions=16 for ${CC} != "icc"
only.

> Index: src/sys/conf/kmod.mk
> diff -u src/sys/conf/kmod.mk:1.154 src/sys/conf/kmod.mk:1.155
> --- src/sys/conf/kmod.mk:1.154	Sat Mar  6 13:23:56 2004
> +++ src/sys/conf/kmod.mk	Fri Mar 12 13:36:12 2004
> @@ -70,6 +70,10 @@
>  
>  .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
>  
> +.if ${CC} == "icc"
> +_ICC_CFLAGS:=	${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
> +CFLAGS=		${_ICC_CFLAGS}
> +.endif
> 
This should have been written simply as:

CFLAGS:= ${CFLAGS:...}

The effect is the same though -- you don't have an access to
CFLAGS set in makefile after kmod.mk is included, but it's
probably okay.


Cheers,
-- 
Ruslan Ermilov
FreeBSD committer
ru at FreeBSD.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040312/0476ee29/attachment.bin