From owner-cvs-src@FreeBSD.ORG Fri Mar 12 13:56:58 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CCD316A4CE; Fri, 12 Mar 2004 13:56:58 -0800 (PST) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0293643D3F; Fri, 12 Mar 2004 13:56:57 -0800 (PST) (envelope-from ru@ip.net.ua) Received: from heffalump.office.ipnet (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.10/8.12.9) with ESMTP id i2CM0nee064821 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Mar 2004 00:00:51 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.office.ipnet (8.12.11/8.12.11) id i2CLuo71004681; Fri, 12 Mar 2004 23:56:50 +0200 (EET) (envelope-from ru) Date: Fri, 12 Mar 2004 23:56:49 +0200 From: Ruslan Ermilov To: Tom Rhodes Message-ID: <20040312215649.GA4588@ip.net.ua> References: <200403122136.i2CLaCm9096276@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3MwIy2ne0vdjdPXF" Content-Disposition: inline In-Reply-To: <200403122136.i2CLaCm9096276@repoman.freebsd.org> User-Agent: Mutt/1.5.6i X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: 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 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Mar 2004 21:56:58 -0000 --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 @@ > =20 > . if ${MACHINE_ARCH} =3D=3D "i386" > . if ${CPUTYPE} =3D=3D "athlon-mp" || ${CPUTYPE} =3D=3D "athlon-xp" || \ > - ${CPUTYPE} =3D=3D "athlon-4" || ${CPUTYPE} =3D=3D "athlon-tbird" || \ > - ${CPUTYPE} =3D=3D "athlon" > + ${CPUTYPE} =3D=3D "athlon-4" || ${CPUTYPE} =3D=3D "athlon-tbird" > +_ICC_CPUCFLAGS =3D -tpp6 -xiMK > _CPUCFLAGS =3D -march=3D${CPUTYPE} > +. elif ${CPUTYPE} =3D=3D "athlon-tbird" || ${CPUTYPE} =3D=3D "athlon" > +_CPUCFLAGS =3D -march=3D${CPUTYPE} > +_ICC_CPUCFLAGS =3D -tpp6 -xiM >=20 "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} > + >=20 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 > =20 > -.endif !defined(INTERNALLIB) > +.endif #!defined(INTERNALLIB) > =20 Please revert this. > Index: src/sys/conf/kern.pre.mk > .if defined(PROFLEVEL) && ${PROFLEVEL} >=3D 1 > +. if ${CC} =3D=3D "icc" > +CFLAGS+=3D -DGPROF > +. else > CFLAGS+=3D -DGPROF -falign-functions=3D16 > +. endif >=20 This can be written better, by having only one -DGPROF for all compilers, and adding -falign-functions=3D16 for ${CC} !=3D "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 @@ > =20 > .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S > =20 > +.if ${CC} =3D=3D "icc" > +_ICC_CFLAGS:=3D ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} > +CFLAGS=3D ${_ICC_CFLAGS} > +.endif >=20 This should have been written simply as: CFLAGS:=3D ${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, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAUjIhUkv4P6juNwoRAoCNAJ9a9d/oG3J7KPQk7ovlgS0l9B1eMgCfWSIn FRtfQRXHPt6PAgEO4/8lJt4= =2qos -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF--