From owner-freebsd-current Fri May 31 9: 9:26 2002 Delivered-To: freebsd-current@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 8357C37B407; Fri, 31 May 2002 09:08:47 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g4VG8eM80758; Fri, 31 May 2002 19:08:40 +0300 (EEST) (envelope-from ru) Date: Fri, 31 May 2002 19:08:39 +0300 From: Ruslan Ermilov To: Alfred Perlstein , John Hay Cc: Takahashi Yoshihiro , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, current@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h Message-ID: <20020531160839.GA74734@sunbay.com> References: <200205311202.g4VC2oU13402@zibbi.icomtek.csir.co.za> <200205300730.g4U7UhQ06252@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vkogqOf2sHV7VnPd" Content-Disposition: inline In-Reply-To: <200205311202.g4VC2oU13402@zibbi.icomtek.csir.co.za> <200205300730.g4U7UhQ06252@freefall.freebsd.org> User-Agent: Mutt/1.3.99i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --vkogqOf2sHV7VnPd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 30, 2002 at 12:30:43AM -0700, Alfred Perlstein wrote: > alfred 2002/05/30 00:30:43 PDT >=20 > Modified files: > sys/dev/ct ct_machdep.h=20 > sys/dev/ncv ncr53c500var.h=20 > sys/dev/stg tmc18c30var.h=20 > Log: > Check for defined(__i386__) instead of just defined(i386) since the com= piler > will be updated to only define(__i386__) for ANSI cleanliness. > =20 > Revision Changes Path > 1.4 +3 -3 src/sys/dev/ct/ct_machdep.h > 1.7 +3 -3 src/sys/dev/ncv/ncr53c500var.h > 1.6 +3 -3 src/sys/dev/stg/tmc18c30var.h On Fri, May 31, 2002 at 02:02:50PM +0200, John Hay wrote: > A GENERIC kernel on current fails to compile missing softintr. >=20 > ############################# > beast:/sys/i386/compile/GENERIC # make -DNO_MODULES -DNO_WERROR > cc -c -O -pipe -march=3Dpentiumpro -Wall -Wredundant-decls -Wnested-exter= ns -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcas= t-qual -Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev -= I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../incl= ude -D_KERNEL -ffreestanding -include opt_global.h -fno-common -mpreferr= ed-stack-boundary=3D2 -ffreestanding ../../../dev/ncv/ncr53c500.c > ../../../dev/ncv/ncr53c500.c: In function `ncv_world_start': > ../../../dev/ncv/ncr53c500.c:503: warning: implicit declaration of functi= on `softintr' > cc -c -O -pipe -march=3Dpentiumpro -Wall -Wredundant-decls -Wnested-exter= ns -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcas= t-qual -Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev -= I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../incl= ude -D_KERNEL -ffreestanding -include opt_global.h -fno-common -mpreferr= ed-stack-boundary=3D2 -ffreestanding ../../../dev/nsp/nsp.c > ../../../dev/nsp/nsp.c: In function `nsp_world_start': > ../../../dev/nsp/nsp.c:495: warning: implicit declaration of function `so= ftintr' > cc -c -O -pipe -march=3Dpentiumpro -Wall -Wredundant-decls -Wnested-exter= ns -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcas= t-qual -Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev -= I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../incl= ude -D_KERNEL -ffreestanding -include opt_global.h -fno-common -mpreferr= ed-stack-boundary=3D2 -ffreestanding ../../../dev/stg/tmc18c30.c > ../../../dev/stg/tmc18c30.c: In function `stg_world_start': > ../../../dev/stg/tmc18c30.c:377: warning: implicit declaration of functio= n `softintr' > sh ../../../conf/newvers.sh GENERIC=20 > cc -c -O -pipe -march=3Dpentiumpro -Wall -Wredundant-decls -Wnested-exter= ns -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcas= t-qual -Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev -= I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../incl= ude -D_KERNEL -ffreestanding -include opt_global.h -fno-common -mpreferr= ed-stack-boundary=3D2 -ffreestanding vers.c > linking kernel.debug > ncr53c500.o: In function `ncv_world_start': > ../../../dev/ncv/ncr53c500.c:503: undefined reference to `softintr' > nsp.o: In function `nsp_world_start': > ../../../dev/nsp/nsp.c:495: undefined reference to `softintr' > tmc18c30.o: In function `stg_world_start': > ../../../dev/stg/tmc18c30.c:377: undefined reference to `softintr' > *** Error code 1 >=20 > Stop in /usr/src/sys/i386/compile/GENERIC. > ############################# >=20 > John Alfred, Your changes above broke building the GENERIC kernel. __i386__ is always defined (whether -ansi or not), and this now causes SOFT_INTR_REQUIRED() macro to use non-existing softintr(). (Well, it's defined as empty in sys/i386/isa/bs/bsif.h.) I'm not sure what would me more correct; to include the definition of softintr() from bsif.h, or to just commit the following: %%% Index: ct/ct.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/ct/ct.c,v retrieving revision 1.5 diff -u -p -r1.5 ct.c --- ct/ct.c 20 Mar 2002 02:04:09 -0000 1.5 +++ ct/ct.c 31 May 2002 16:02:22 -0000 @@ -505,7 +505,6 @@ ct_world_start(ct, fdone) scsi_low_bus_reset(slp); cthw_chip_reset(chp, NULL, ct->sc_chipclk, slp->sl_hostid); =20 - SOFT_INTR_REQUIRED(slp); return 0; } =20 Index: ct/ct_machdep.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/ct/ct_machdep.h,v retrieving revision 1.4 diff -u -p -r1.4 ct_machdep.h --- ct/ct_machdep.h 30 May 2002 07:30:42 -0000 1.4 +++ ct/ct_machdep.h 31 May 2002 16:02:22 -0000 @@ -208,9 +208,4 @@ ct_cmdp_write_1(chp, val) CT_BUS_WEIGHT(chp) } =20 -#if defined(__i386__) -#define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) -#else /* !__i386__ */ -#define SOFT_INTR_REQUIRED(slp) -#endif /* !__i386__ */ #endif /* !_CT_MACHDEP_H_ */ Index: ncv/ncr53c500.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/ncv/ncr53c500.c,v retrieving revision 1.7 diff -u -p -r1.7 ncr53c500.c --- ncv/ncr53c500.c 20 Mar 2002 02:07:32 -0000 1.7 +++ ncv/ncr53c500.c 31 May 2002 16:02:22 -0000 @@ -500,7 +500,6 @@ ncv_world_start(sc, fdone) (bus_space_read_1(sc->sc_iot, sc->sc_ioh, cr0_istat) & INTR_SBR)) return ENODEV; =20 - SOFT_INTR_REQUIRED(slp); return 0; } =20 Index: ncv/ncr53c500var.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/ncv/ncr53c500var.h,v retrieving revision 1.7 diff -u -p -r1.7 ncr53c500var.h --- ncv/ncr53c500var.h 30 May 2002 07:30:43 -0000 1.7 +++ ncv/ncr53c500var.h 31 May 2002 16:02:22 -0000 @@ -95,9 +95,4 @@ void ncvattachsubr(struct ncv_softc *); int ncvprint(void *, const char *); int ncvintr(void *); =20 -#if defined(__i386__) -#define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) -#else /* !__i386__ */ -#define SOFT_INTR_REQUIRED(slp) -#endif /* !__i386__ */ #endif /* !_NCR53C500VAR_H_ */ Index: stg/tmc18c30.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/stg/tmc18c30.c,v retrieving revision 1.8 diff -u -p -r1.8 tmc18c30.c --- stg/tmc18c30.c 20 Mar 2002 02:07:43 -0000 1.8 +++ stg/tmc18c30.c 31 May 2002 16:02:22 -0000 @@ -374,7 +374,6 @@ stg_world_start(sc, fdone) scsi_low_bus_reset(slp); stghw_init(sc); =20 - SOFT_INTR_REQUIRED(slp); return 0; } =20 Index: stg/tmc18c30var.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/stg/tmc18c30var.h,v retrieving revision 1.6 diff -u -p -r1.6 tmc18c30var.h --- stg/tmc18c30var.h 30 May 2002 07:30:43 -0000 1.6 +++ stg/tmc18c30var.h 31 May 2002 16:02:22 -0000 @@ -103,9 +103,4 @@ void stgattachsubr(struct stg_softc *); int stgprint(void *, const char *); int stgintr(void *); =20 -#if defined(__i386__) -#define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) -#else /* !__i386__ */ -#define SOFT_INTR_REQUIRED(slp) -#endif /* !__i386__ */ #endif /* !_TMC18C30VAR_H_ */ %%% --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --vkogqOf2sHV7VnPd Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iD8DBQE896AHUkv4P6juNwoRAsuGAJ46VYiO9HJphmPfmtiEiJtrmMCmTACgiSIU cSSf+dkVIis+cGGRy2yrsf0= =zD/U -----END PGP SIGNATURE----- --vkogqOf2sHV7VnPd-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message