From owner-freebsd-current@FreeBSD.ORG Sat Mar 19 00:20:49 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C421F106564A for ; Sat, 19 Mar 2011 00:20:49 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id 541E58FC29 for ; Sat, 19 Mar 2011 00:20:48 +0000 (UTC) Received: by wwc33 with SMTP id 33so5528422wwc.31 for ; Fri, 18 Mar 2011 17:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=Vopf55wn4019qfRgeLD3AqnitdfV/DscZexwYhbp9b0=; b=oeJ+6ohg8BxzPNNRaGPPb4Nrt9qT7o6kYIKIQ9ZmaMToffNIqKvv2gYT6M5MO2NhHR 4LEc56h2vuZ00DZiLVHrtJFwoB0bB86Ve9WXijhwdLwyXgNunrNX3ocpA1/5p4SlVDDR lm/gh2SJRRVVjHPmqNWvaDYt3tvAKoIENV45w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=dIBtkO/T3XbRfTiECEq3fp81VYPzwrKwZoy9Zko8By1fg7FVvSbjhKNnf13hJdbN1G 2OIyjze5+VN9M2O3eprK1u3bKnv9IPpcCW/6leW8sXEPdhSM8IMxwpRVkarVXEV2yFo/ 7QW1iiBUPV0pCY9pvMd/jlTuE0enNglraWhFE= MIME-Version: 1.0 Received: by 10.216.230.99 with SMTP id i77mr1605051weq.100.1300494047855; Fri, 18 Mar 2011 17:20:47 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.216.173.142 with HTTP; Fri, 18 Mar 2011 17:20:47 -0700 (PDT) In-Reply-To: References: <201103182337.p2INbIKu066558@freebsd-current.sentex.ca> Date: Fri, 18 Mar 2011 17:20:47 -0700 X-Google-Sender-Auth: OTWmXRRZnwsTB-ETy38-ufvgImc Message-ID: From: Garrett Cooper To: Arnaud Lacombe Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org, i386@freebsd.org, FreeBSD Tinderbox , Jack Vogel Subject: Re: [head tinderbox] failure on i386/pc98 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Mar 2011 00:20:49 -0000 On Fri, Mar 18, 2011 at 5:19 PM, Garrett Cooper wrote= : > On Fri, Mar 18, 2011 at 4:45 PM, Arnaud Lacombe wrot= e: >> Hi, >> >> On Fri, Mar 18, 2011 at 7:37 PM, FreeBSD Tinderbox >> 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 -Wpoint= er-arith -Winline -Wcast-qual =A0-Wundef -Wno-pointer-sign -fformat-extensi= ons -nostdinc =A0-I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL -DHAVE_KE= RNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=3D8000= --param inline-unit-growth=3D100 --param large-function-growth=3D1000 -DGP= ROF -falign-functions=3D16 -DGPROF4 -DGUPROF -fno-builtin -mno-align-long-s= trings -mpreferred-stack-boundary=3D2 -mno-mmx -mno-3dnow -mno-sse -mno-sse= 2 -mno-sse3 -msoft-float -ffreestanding -fstack-protector -Werror -pg -mpro= filer-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 previou= s 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 ... > > =A0 =A0That won't work. It needs to be SYSCTL_ADD_U64 now. Oh wait... mdf didn't change that. Sorry, please ignore the previous messag= e. -Garrett