From owner-cvs-src@FreeBSD.ORG Fri Mar 12 14:33:23 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 CC9D316A4CF; Fri, 12 Mar 2004 14:33:23 -0800 (PST) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1D7443D31; Fri, 12 Mar 2004 14:33:22 -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 i2CMbFee065412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Mar 2004 00:37:17 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.office.ipnet (8.12.11/8.12.11) id i2CMXFnr005066; Sat, 13 Mar 2004 00:33:15 +0200 (EET) (envelope-from ru) Date: Sat, 13 Mar 2004 00:33:15 +0200 From: Ruslan Ermilov To: Tom Rhodes Message-ID: <20040312223315.GE4588@ip.net.ua> References: <20040312214545.7F3C216A4FA@hub.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="T6xhMxlHU34Bk0ad" Content-Disposition: inline In-Reply-To: <20040312214545.7F3C216A4FA@hub.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/sys/boot/arc/include arcfuncs.h src/sys/boot/i386/boot2 boot2.c src/sys/dev/aic7xxx/aicasm aicasm.c src/sys/dev/cx machdep.h src/sys/dev/ichsmb ichsmb.c src/sys/dev/iir iir.h src/sys/dev/isp ispvar.h src/sys/dev/mcd mcdreg.h ... 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 22:33:25 -0000 --T6xhMxlHU34Bk0ad Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 12, 2004 at 01:45:45PM -0800, Tom Rhodes wrote: [...] > Index: src/sys/dev/mcd/mcdreg.h > =20 > -#ifdef __GNUC__ > -#if __GNUC__ >=3D 2 > +#if defined(__GNUC__) || defined(__INTEL_COMPILER) > +#if __GNUC__ >=3D 2 || defined(__INTEL_COMPILER) > #pragma pack(1) > #endif > #endif > =20 > -#ifdef __GNUC__ > -#if __GNUC__ >=3D 2 > +#if defined(__GNUC__) || defined(__INTEL_COMPILER) > +#if __GNUC__ >=3D 2 || defined(__INTEL_COMPILER) > #pragma pack(4) > #endif > #endif >=20 These ifdefs are broken. #if (defined(__GNUC__) && __GNUC >=3D 2) || defined(__INTEL_COMPILER) would be more correct. > Index: src/sys/dev/scd/scdreg.h > -#ifdef __GNUC__ > -#if __GNUC__ >=3D 2 > +#if defined(__GNUC__) || defined(__INTEL_COMPILER) > +#if __GNUC__ >=3D 2 || defined(__INTEL_COMPILER) > #pragma pack(1) > #endif > #endif >=20 Ditto. > Index: src/sys/i386/i386/in_cksum.c [...] > +#if !defined(__GNUC__) || defined(__INTEL_COMPILER) >=20 What, __INTEL_COMPILER can have __GNUC__ defined? > Index: src/sys/i386/include/_types.h > diff -u src/sys/i386/include/_types.h:1.7 src/sys/i386/include/_types.h:1= =2E8 > --- src/sys/i386/include/_types.h:1.7 Sat Mar 29 21:24:52 2003 > +++ src/sys/i386/include/_types.h Fri Mar 12 13:45:29 2004 > @@ -113,12 +113,12 @@ > /* > * Unusual type definitions. > */ > -#if defined(__GNUC__) && (__GNUC__ =3D=3D 2 && __GNUC_MINOR__ > 95 || __= GNUC__ >=3D 3) > +#if (defined(__GNUC__) && (__GNUC__ =3D=3D 2 && __GNUC_MINOR__ > 95 || _= _GNUC__ >=3D 3) && !defined(__INTEL_COMPILER)) >=20 Redundant surrounding parenthesis. > Index: src/sys/i386/include/in_cksum.h [...] > +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) >=20 I think these are mutually exclusive already, no? > Index: src/sys/i386/include/stdarg.h [...] > -#if defined(__GNUC__) && (__GNUC__ =3D=3D 2 && __GNUC_MINOR__ > 95 || __= GNUC__ >=3D 3) > +#if (defined(__GNUC__) && (__GNUC__ =3D=3D 2 && __GNUC_MINOR__ > 95 || _= _GNUC__ >=3D 3) && !defined(__INTEL_COMPILER)) > =20 Redundant parenthesis. > Index: src/sys/sys/cdefs.h > -#ifndef __GNUC__ > +#if !(defined(__GNUC__) || defined(__INTEL_COMPILER)) >=20 Mechanical non-optimized changes? ;) > -#if !__GNUC_PREREQ__(2, 5) > +#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER) >=20 Better than above. ;) Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --T6xhMxlHU34Bk0ad Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAUjqrUkv4P6juNwoRAk2sAJoCS4NnB/DeozEkCyE/sZnSKHBnzwCfTUyc ELpX2mnxtmRsNt41U4z0a3M= =sTRc -----END PGP SIGNATURE----- --T6xhMxlHU34Bk0ad--