From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758334AbZEBPkq (ORCPT ); Sat, 2 May 2009 11:40:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755580AbZEBPkg (ORCPT ); Sat, 2 May 2009 11:40:36 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:54647 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756033AbZEBPkf (ORCPT ); Sat, 2 May 2009 11:40:35 -0400 X-Greylist: delayed 1344 seconds by postgrey-1.27 at vger.kernel.org; Sat, 02 May 2009 11:40:34 EDT Date: Sun, 03 May 2009 00:17:30 +0900 Message-ID: From: Hirokazu Takata To: Linus Torvalds , Tim Abbott , Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Rusty Russell , Andi Kleen , "H. Peter Anvin" , Stephen Rothwell , Jeff Arnold , Andrew Morton , Jon Masters , Masami Hiramatsu , "Theodore Ts'o" , Nikanth Karthikesan , Arjan van de Ven , Paul Mundt , =?ISO-8859-1?Q?A?= =?ISO-8859-1?Q?m=E9rico?= Wang , Ralf Baechle , Kyle McMartin , David Howells , Hirokazu Takata Subject: [GIT PULL] m32r: build fix for 2.6.30-rc3-git2 User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.2 (x86_64-pc-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (was Re: [PATCH 07/15] m32r: convert to use __HEAD and HEAD_TEXT macros.) In-Reply-To: References: <1240711870-30505-1-git-send-email-tabbott@mit.edu> <1240711870-30505-2-git-send-email-tabbott@mit.edu> <1240711870-30505-3-git-send-email-tabbott@mit.edu> <1240711870-30505-4-git-send-email-tabbott@mit.edu> <1240711870-30505-5-git-send-email-tabbott@mit.edu> <1240711870-30505-6-git-send-email-tabbott@mit.edu> <1240711870-30505-7-git-send-email-tabbott@mit.edu> <20090426112145.GF28642@uranus.ravnborg.org> User-Agent: Wanderlust/2.14.0 (Africa) Emacs/22.2 Mule/5.0 (SAKAKI) Hello, Linus and folks, [PATCH 07/15] m32r: convert to use __HEAD and HEAD_TEXT macros. commit: 34963696629b6d1e0066a5f2e67993e409c9434b The above patch causes the following build error of 2.6.30-rc3-git2: AS arch/m32r/kernel/head.o In file included from /include/linux/init.h:7, from /arch/m32r/kernel/head.S:11: /include/linux/stringify.h:9: error: syntax error in macro parameter list /include/linux/stringify.h:10: error: syntax error in macro parameter list It is because __HEAD macro uses a __stringify() macro and the __stringify() macro depends on the gcc's variadic macro extension function, though -traditional option is specified as EXTRA_AFLAGS in the m32r kernel. Make __stringify support variable argument macros too commit: 8f7c2c37319a81ef4c2bfdec67b1ccd5744d97e4 I think we can remove -traditional option from EXTRA_AFLAGS for the m32r. Please pull from the m32r git tree: git://www.linux-m32r.org/git/takata/linux-2.6_dev.git for-linus Thank you. -- Takata Hirokazu Takata (2): m32r: build fix for __stringify macro m32r: use __stringify() macro in assembler.h commit 9cd67243de582c206758adff152c5fcc1b2aa069 Author: Hirokazu Takata Date: Sat May 2 22:08:33 2009 +0900 m32r: use __stringify() macro in assembler.h Replace #x with __stringify(x). Also, #ifndef __STR is removed and undefine __STR macro at the beginning. The __STR() macro is still remained, because the assembler.h might be included from assembly codes as well as C codes. Signed-off-by: Hirokazu Takata --- arch/m32r/include/asm/assembler.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/m32r/include/asm/assembler.h b/arch/m32r/include/asm/assembler.h index 2635153..728799f 100644 --- a/arch/m32r/include/asm/assembler.h +++ b/arch/m32r/include/asm/assembler.h @@ -9,14 +9,15 @@ * This file contains M32R architecture specific macro definitions. */ +#include + +#undef __STR -#ifndef __STR #ifdef __ASSEMBLY__ #define __STR(x) x #else -#define __STR(x) #x +#define __STR(x) __stringify(x) #endif -#endif /* __STR */ #ifdef CONFIG_SMP #define M32R_LOCK __STR(lock) commit 9c88b06dc7589fb0bccd617c4659066fb803cfda Author: Hirokazu Takata Date: Sat May 2 20:29:00 2009 +0900 m32r: build fix for __stringify macro This patch fixes the following build error of 2.6.30-rc3-git2: AS arch/m32r/kernel/head.o In file included from /include/linux/init.h:7, from /arch/m32r/kernel/head.S:11: /include/linux/stringify.h:9: error: syntax error in macro parameter list /include/linux/stringify.h:10: error: syntax error in macro parameter list This build error was caused at __HEAD macro in arch/m32r/kernel/head.S, which uses __stringify() macro. Remove -traditional option from EXTRA_AFLAGS for the m32r, because the __stringify() macro depends on the gcc's variadic macro extension function, due to commit: Make __stringify support variable argument macros too commit: 8f7c2c37319a81ef4c2bfdec67b1ccd5744d97e4 Signed-off-by: Hirokazu Takata --- arch/m32r/boot/compressed/Makefile | 1 - arch/m32r/kernel/Makefile | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile index d908e1d..560484a 100644 --- a/arch/m32r/boot/compressed/Makefile +++ b/arch/m32r/boot/compressed/Makefile @@ -6,7 +6,6 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ piggy.o vmlinux.lds -EXTRA_AFLAGS := -traditional OBJECTS = $(obj)/head.o $(obj)/misc.o diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile index 09200d4..b1a4b60 100644 --- a/arch/m32r/kernel/Makefile +++ b/arch/m32r/kernel/Makefile @@ -9,5 +9,3 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \ obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_MODULES) += module.o - -EXTRA_AFLAGS := -traditional > From: Sam Ravnborg > Subject: Re: [PATCH 07/15] m32r: convert to use __HEAD and HEAD_TEXT macros. > Date: Sun, 26 Apr 2009 13:21:45 +0200 > > On Sat, Apr 25, 2009 at 10:11:02PM -0400, Tim Abbott wrote: > > > This has the consequence of changing the section name use for head > > > code from ".text.head" to ".head.text". Since this commit changes all > > > users in the architecture, this change should be harmless. > > > > > > Signed-off-by: Tim Abbott > > > Cc: Hirokazu Takata > > Acked-by: Sam Ravnborg > Acked-by: Hirokazu Takata > > > > --- > > > arch/m32r/kernel/head.S | 2 +- > > > arch/m32r/kernel/vmlinux.lds.S | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S > > > index 9091606..0a71944 100644 > > > --- a/arch/m32r/kernel/head.S > > > +++ b/arch/m32r/kernel/head.S > > > @@ -23,7 +23,7 @@ __INITDATA > > > /* > > > * References to members of the boot_cpu_data structure. > > > */ > > > -.section .text.head, "ax" > > > +__HEAD > > > .global start_kernel > > > .global __bss_start > > > .global _end > > > diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S > > > index 9db05df..4179adf 100644 > > > --- a/arch/m32r/kernel/vmlinux.lds.S > > > +++ b/arch/m32r/kernel/vmlinux.lds.S > > > @@ -27,7 +27,7 @@ SECTIONS > > > _text = .; /* Text and read-only data */ > > > .boot : { *(.boot) } = 0 > > > .text : { > > > - *(.text.head) > > > + HEAD_TEXT > > > TEXT_TEXT > > > SCHED_TEXT > > > LOCK_TEXT > > > -- > > > 1.6.2.1 > > > > > >