From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joakim Tjernlund Subject: Re: linux-next: origin tree build failure Date: Tue, 12 Jan 2010 13:38:29 +0100 Message-ID: References: <20100112105805.50e39a77.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: Received: from gw1.transmode.se ([213.115.205.20]:55204 "EHLO gw1.transmode.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751310Ab0ALMnN (ORCPT ); Tue, 12 Jan 2010 07:43:13 -0500 In-Reply-To: <20100112105805.50e39a77.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Andrew Morton , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Paul Mackerras , Linus Stephen Rothwell wrote on 12/01/2010 00:58:05: > > Hi all, > > Today's linux-next build (powerpc ppc64_defconfig) failed like this: > > cc1: error: include/linux/autoconf.h: No such file or directory > > (while building the boot wrappers - lots more of the same) > > Caused by commit ac4c2a3bbe5db5fc570b1d0ee1e474db7cb22585 ("zlib: > optimize inffast when copying direct from output"). autoconf.h moved > from include/linux to include/generated in commit > 264a26838056fc2d759f58bec2e720e01fcb1bdb ("kbuild: move autoconf.h to > include/generated") which was in linux-next since 14 Dec 2009 and in > Linus' tree since 18 Dec 2009. > [SNIP] > > This latter build problem is probably only noticed if you build with a > separate object directory (i.e. with O=.. on the make command). The > previous PowerPC maintainer tells me that defining __KERNEL__ in the > BOOTFLAGS is wrong and should have been noticed. Is this any better w.r.t __KERNEL__? >>From 1a79993a42e17be665d3488663d81c0513b8bbfe Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Tue, 12 Jan 2010 13:31:58 +0100 Subject: [PATCH] powerpc: move __KERNEL__ define in bootwrapper. Apparently using -D__KERNEL__ in BOOTCFLAGS is a bad thing. Move __KERNEL__ into inffast.c where it is needed. Signed-off-by: Joakim Tjernlund --- arch/powerpc/boot/Makefile | 2 +- lib/zlib_inflate/inffast.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 79ebd6f..766fb88 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -20,7 +20,7 @@ all: $(obj)/zImage BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -Os -msoft-float -pipe -D__KERNEL__\ + -fno-strict-aliasing -Os -msoft-float -pipe \ -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ -isystem $(shell $(CROSS32CC) -print-file-name=include) BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib_inflate/inffast.c index 05e1559..919c162 100644 --- a/lib/zlib_inflate/inffast.c +++ b/lib/zlib_inflate/inffast.c @@ -2,7 +2,9 @@ * Copyright (C) 1995-2004 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ - +#ifndef __KERNEL__ +#define __KERNEL__ +#endif #include #include #include -- 1.6.4.4