r347836 (not MFC'ed) on head eliminates inclusion of machine/bus.h for
usr.sbin/camdd/camdd.c.
This whole commit introduces some bool functions, but head builds fine.

I'm not shure applying camdd.c part alone is OK, so cherry-picked
this revision excluding sys/compat/linuxkpi/common/src/linux_pci.c part
and it fixes build. Not yet tested r355089, though.


On Mon, 25 Nov 2019 16:21:41 +0200
Konstantin Belousov <kostik...@gmail.com> wrote:

> On Mon, Nov 25, 2019 at 03:58:10AM -0800, David Wolfskill wrote:
> > This is during a source-based update from r355048 to r355087, during
> > "stage 4.3: building everything" (using META_MODE); meta file reads:
> > 
> > # Meta data file 
> > /common/S3/obj/usr/src/amd64.amd64/usr.sbin/camdd/camdd.o.meta
> > CMD cc -target x86_64-unknown-freebsd12.1 
> > --sysroot=/common/S3/obj/usr/src/amd64.amd64/tmp 
> > -B/common/S3/obj/usr/src/amd64.amd64/tmp/usr/bin  -O2 -pipe   -std=gnu99 
> > -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-y2k -W 
> > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes 
> > -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow 
> > -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wnested-externs 
> > -Wredundant-decls -Wold-style-definition -Wno-pointer-sign 
> > -Wmissing-variable-declarations -Wno-empty-body -Wno-string-plus-int 
> > -Wno-unused-const-variable  -Qunused-arguments  -c 
> > /usr/src/usr.sbin/camdd/camdd.c -o camdd.o
> > CMD 
> > CWD /common/S3/obj/usr/src/amd64.amd64/usr.sbin/camdd
> > TARGET camdd.o
> > -- command output --
> > In file included from /usr/src/usr.sbin/camdd/camdd.c:54:
> > In file included from 
> > /common/S3/obj/usr/src/amd64.amd64/tmp/usr/include/machine/bus.h:6:
> > In file included from 
> > /common/S3/obj/usr/src/amd64.amd64/tmp/usr/include/x86/bus.h:1043:
> > In file included from 
> > /common/S3/obj/usr/src/amd64.amd64/tmp/usr/include/machine/bus_dma.h:34:
> > /common/S3/obj/usr/src/amd64.amd64/tmp/usr/include/x86/bus_dma.h:182:1: 
> > error: unknown type name 'bool'
> > bool bus_dma_dmar_set_buswide(device_t dev);
> > ^
> > /common/S3/obj/usr/src/amd64.amd64/tmp/usr/include/x86/bus_dma.h:182:31: 
> > error: unknown type name 'device_t'
> > bool bus_dma_dmar_set_buswide(device_t dev);
> >                               ^
> > 2 errors generated.
> > 
> > *** Error code 1
> 
> I hope that this is fixed by r355089.  I did not tracked down how HEAD
> was immune to the problem.
> _______________________________________________
> freebsd-stable@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"


-- 
Tomoaki AOKI    <junch...@dec.sakura.ne.jp>
_______________________________________________
freebsd-stable@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"

Reply via email to