From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Subject: Re: [PATCH 3/4] kbuild: link of vmlinux moved to a script Date: Thu, 10 May 2012 10:44:06 -0400 Message-ID: <4FABD436.7070402@windriver.com> References: <20120428205651.GA7426@merkur.ravnborg.org> <20120428205919.GC7442@merkur.ravnborg.org> <4FA460AB.6060309@suse.cz> <20120505082916.GA14006@merkur.ravnborg.org> <20120508165118.GA11750@merkur.ravnborg.org> <20120510122210.GA17550@sepie.suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120510122210.GA17550@sepie.suse.cz> Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org To: Michal Marek Cc: Sam Ravnborg , Tony Luck , linux arch , lkml , linux-kbuild , Richard Weinberger , "David S. Miller" , Arnaud Lacombe , Andi Kleen , ralf@linux-mips.org, linux-mips@linux-mips.org List-Id: linux-arch.vger.kernel.org On 12-05-10 08:22 AM, Michal Marek wrote: > On Wed, May 09, 2012 at 06:58:16PM -0400, Paul Gortmaker wrote: >> On Tue, May 8, 2012 at 12:51 PM, Sam Ravnborg wrote: >>> diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh >>> index 26c5b65..1f4c27b 100644 >>> --- a/scripts/link-vmlinux.sh >>> +++ b/scripts/link-vmlinux.sh >>> @@ -78,8 +78,8 @@ kallsyms() >>> kallsymopt=--all-symbols >>> fi >>> >>> - local aflags="${KBUILD_AFLAGS} ${NOSTDINC_FLAGS} \ >>> - ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" >>> + local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ >>> + ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" >> >> All the linux-next builds for mips are failing, which I tracked down to this. >> Applying the above update doesn't help. What is happening is that MIPS >> gets KBUILD_CPPFLAGS double-quoted, and then you get: >> >> + mips-wrs-linux-gnu-nm -n .tmp_vmlinux1 >> + scripts/kallsyms >> + mips-wrs-linux-gnu-gcc -D__ASSEMBLY__ <..snip..> -D__KERNEL__ >> '-D"VMLINUX_LOAD_ADDRESS=0xffffffff81100000"' '-D"DATAOFFSET=0"' -c -o >> .tmp_kallsyms1.o -x assembler-with-cpp - >> :0: error: macro names must be identifiers >> :0: error: macro names must be identifiers >> make[1]: *** [vmlinux] Error 1 >> >> Note the '-D"VMLINUX_LOAD_ADDRESS=0xffffffff81100000"' '-D"DATAOFFSET=0"' >> part -- that is what triggers the two above errors. > > I think it should be as simple as the below patch. But I have no mips > machine to verify myself. Well I haven't boot tested it on anything either, but it does seem to resolve the double quoting that caused the compile failure. Thanks, Paul. -- > > Michal > > From d801533d5e6e509d5e115d2fb47655267c4c5ed4 Mon Sep 17 00:00:00 2001 > From: Michal Marek > Date: Thu, 10 May 2012 14:15:49 +0200 > Subject: [PATCH] mips: Fix KBUILD_CPPFLAGS definition > > The KBUILD_CPPFLAGS variable is no longer passed to sh -c 'gcc ...', > but exported and used by the link-vmlinux.sh script. This means that the > double-quotes will not be evaluated by the shell. > > Reported-by: Paul Gortmaker > Signed-off-by: Michal Marek > > diff --git a/arch/mips/Makefile b/arch/mips/Makefile > index 4fedf5a..722e04a 100644 > --- a/arch/mips/Makefile > +++ b/arch/mips/Makefile > @@ -219,8 +219,8 @@ endif > > KBUILD_AFLAGS += $(cflags-y) > KBUILD_CFLAGS += $(cflags-y) > -KBUILD_CPPFLAGS += -D"VMLINUX_LOAD_ADDRESS=$(load-y)" > -KBUILD_CPPFLAGS += -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" > +KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) > +KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) > > LDFLAGS += -m $(ld-emul) > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com ([147.11.146.13]:61458 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753218Ab2EJOpj (ORCPT ); Thu, 10 May 2012 10:45:39 -0400 Message-ID: <4FABD436.7070402@windriver.com> Date: Thu, 10 May 2012 10:44:06 -0400 From: Paul Gortmaker MIME-Version: 1.0 Subject: Re: [PATCH 3/4] kbuild: link of vmlinux moved to a script References: <20120428205651.GA7426@merkur.ravnborg.org> <20120428205919.GC7442@merkur.ravnborg.org> <4FA460AB.6060309@suse.cz> <20120505082916.GA14006@merkur.ravnborg.org> <20120508165118.GA11750@merkur.ravnborg.org> <20120510122210.GA17550@sepie.suse.cz> In-Reply-To: <20120510122210.GA17550@sepie.suse.cz> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Michal Marek Cc: Sam Ravnborg , Tony Luck , linux arch , lkml , linux-kbuild , Richard Weinberger , "David S. Miller" , Arnaud Lacombe , Andi Kleen , ralf@linux-mips.org, linux-mips@linux-mips.org Message-ID: <20120510144406.QMEWg8ONbFv4cXSnO0u8vKraACkhTfEMvFBSscM_avk@z> On 12-05-10 08:22 AM, Michal Marek wrote: > On Wed, May 09, 2012 at 06:58:16PM -0400, Paul Gortmaker wrote: >> On Tue, May 8, 2012 at 12:51 PM, Sam Ravnborg wrote: >>> diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh >>> index 26c5b65..1f4c27b 100644 >>> --- a/scripts/link-vmlinux.sh >>> +++ b/scripts/link-vmlinux.sh >>> @@ -78,8 +78,8 @@ kallsyms() >>> kallsymopt=--all-symbols >>> fi >>> >>> - local aflags="${KBUILD_AFLAGS} ${NOSTDINC_FLAGS} \ >>> - ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" >>> + local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ >>> + ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" >> >> All the linux-next builds for mips are failing, which I tracked down to this. >> Applying the above update doesn't help. What is happening is that MIPS >> gets KBUILD_CPPFLAGS double-quoted, and then you get: >> >> + mips-wrs-linux-gnu-nm -n .tmp_vmlinux1 >> + scripts/kallsyms >> + mips-wrs-linux-gnu-gcc -D__ASSEMBLY__ <..snip..> -D__KERNEL__ >> '-D"VMLINUX_LOAD_ADDRESS=0xffffffff81100000"' '-D"DATAOFFSET=0"' -c -o >> .tmp_kallsyms1.o -x assembler-with-cpp - >> :0: error: macro names must be identifiers >> :0: error: macro names must be identifiers >> make[1]: *** [vmlinux] Error 1 >> >> Note the '-D"VMLINUX_LOAD_ADDRESS=0xffffffff81100000"' '-D"DATAOFFSET=0"' >> part -- that is what triggers the two above errors. > > I think it should be as simple as the below patch. But I have no mips > machine to verify myself. Well I haven't boot tested it on anything either, but it does seem to resolve the double quoting that caused the compile failure. Thanks, Paul. -- > > Michal > > From d801533d5e6e509d5e115d2fb47655267c4c5ed4 Mon Sep 17 00:00:00 2001 > From: Michal Marek > Date: Thu, 10 May 2012 14:15:49 +0200 > Subject: [PATCH] mips: Fix KBUILD_CPPFLAGS definition > > The KBUILD_CPPFLAGS variable is no longer passed to sh -c 'gcc ...', > but exported and used by the link-vmlinux.sh script. This means that the > double-quotes will not be evaluated by the shell. > > Reported-by: Paul Gortmaker > Signed-off-by: Michal Marek > > diff --git a/arch/mips/Makefile b/arch/mips/Makefile > index 4fedf5a..722e04a 100644 > --- a/arch/mips/Makefile > +++ b/arch/mips/Makefile > @@ -219,8 +219,8 @@ endif > > KBUILD_AFLAGS += $(cflags-y) > KBUILD_CFLAGS += $(cflags-y) > -KBUILD_CPPFLAGS += -D"VMLINUX_LOAD_ADDRESS=$(load-y)" > -KBUILD_CPPFLAGS += -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" > +KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) > +KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) > > LDFLAGS += -m $(ld-emul) >