Date: Fri, 18 Mar 2011 17:19:55 -0700 From: Garrett Cooper <gcooper@FreeBSD.org> To: Arnaud Lacombe <lacombar@gmail.com> Cc: current@freebsd.org, i386@freebsd.org, FreeBSD Tinderbox <tinderbox@freebsd.org>, Jack Vogel <jfvogel@gmail.com> Subject: Re: [head tinderbox] failure on i386/pc98 Message-ID: <AANLkTim-W9%2B9cN9mPAmWeHV7F3W4qeAdemNenUK_y3Q0@mail.gmail.com> In-Reply-To: <AANLkTimcet4mwPzPLuR6cmdPmqu=uH9Aa7oVEjeGSCkT@mail.gmail.com> References: <201103182337.p2INbIKu066558@freebsd-current.sentex.ca> <AANLkTimcet4mwPzPLuR6cmdPmqu=uH9Aa7oVEjeGSCkT@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Mar 18, 2011 at 4:45 PM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi,
>
> On Fri, Mar 18, 2011 at 7:37 PM, FreeBSD Tinderbox
> <tinderbox@freebsd.org> wrote:
>> [...]
>> awk -f /src/sys/tools/makeobjops.awk /src/sys/dev/eisa/eisa_if.m -c ; =
=A0cc -c -O2 -pipe -fno-strict-aliasing =A0-std=3Dc99 =A0-Wall -Wredundant-=
decls -Wnested-externs -Wstrict-prototypes =A0-Wmissing-prototypes -Wpointe=
r-arith -Winline -Wcast-qual =A0-Wundef -Wno-pointer-sign -fformat-extensio=
ns -nostdinc =A0-I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL -DHAVE_KER=
NEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=3D8000 =
--param inline-unit-growth=3D100 --param large-function-growth=3D1000 -DGPR=
OF -falign-functions=3D16 -DGPROF4 -DGUPROF -fno-builtin -mno-align-long-st=
rings -mpreferred-stack-boundary=3D2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2=
-mno-sse3 -msoft-float -ffreestanding -fstack-protector -Werror -pg -mprof=
iler-epilogue eisa_if.c
>> cc -c -O2 -pipe -fno-strict-aliasing =A0-std=3Dc99 =A0-Wall -Wredundant-=
decls -Wnested-externs -Wstrict-prototypes =A0-Wmissing-prototypes -Wpointe=
r-arith -Winline -Wcast-qual =A0-Wundef -Wno-pointer-sign -fformat-extensio=
ns -nostdinc =A0-I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL -DHAVE_KER=
NEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=3D8000 =
--param inline-unit-growth=3D100 --param large-function-growth=3D1000 -DGPR=
OF -falign-functions=3D16 -DGPROF4 -DGUPROF -fno-builtin -mno-align-long-st=
rings -mpreferred-stack-boundary=3D2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2=
-mno-sse3 -msoft-float -ffreestanding -fstack-protector -Werror -pg -mprof=
iler-epilogue /src/sys/dev/e1000/if_em.c -I/src/sys/dev/e1000
>> In file included from /src/sys/dev/e1000/if_em.c:86:
>> /src/sys/dev/e1000/if_em.h:216:1: error: "SYSCTL_ADD_UQUAD" redefined
>> In file included from /src/sys/dev/e1000/if_em.c:55:
>> /src/sys/sys/sysctl.h:370:1: error: this is the location of the previous=
definition
>> *** Error code 1
>>
> This should fix it:
>
> diff --git a/src/if_em.h b/src/if_em.h
> index 367d249..9381fc8 100644
> --- a/src/if_em.h
> +++ b/src/if_em.h
> @@ -213,7 +213,7 @@
> =A0#define EM_MSIX_BAR =A0 =A0 =A0 =A0 =A0 =A03 =A0 =A0 =A0 /* On 82575 *=
/
>
> =A0/* More backward compatibility */
> -#if !defined(SYSTCL_ADD_UQUAD)
> +#if !defined(SYSCTL_ADD_UQUAD)
> =A0#define SYSCTL_ADD_UQUAD SYSCTL_ADD_QUAD
> =A0#endif
>
> For the record, I privately sent jfv@ a patch about this build failure
> a month ago ...
That won't work. It needs to be SYSCTL_ADD_U64 now.
Thanks,
-Garrett
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTim-W9%2B9cN9mPAmWeHV7F3W4qeAdemNenUK_y3Q0>