[RFC patch 0/9] Stringify support commas

[RFC patch 0/9] Stringify support commas

[Mathieu Desnoyers]

Hi,

I noticed that the __stringify() macro does not support defines with commas.
This patchset change the macro so it takes variable arguments. All the
"-traditional" compilation flags are removed from all architectures which still
use it so the variadic macro is supported.

It is used by the x86 NMI-safe int3 and page fault patch.

Mathieu

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 1/9] CRIS remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: cris-remove-traditional.patch --]
[-- Type: text/plain, Size: 2451 bytes --]

Subject: [RFC patch 1/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: starvik@axis.com
CC: jesper.nilsson@axis.com
CC: dev-etrax@axis.com
---
 arch/cris/arch-v10/boot/compressed/Makefile |    2 +-
 arch/cris/arch-v10/boot/rescue/Makefile     |    1 -
 arch/cris/arch-v10/lib/Makefile             |    3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

Index: linux-2.6-lttng/arch/cris/arch-v10/boot/compressed/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/cris/arch-v10/boot/compressed/Makefile	2008-04-21 09:54:08.000000000 -0400
+++ linux-2.6-lttng/arch/cris/arch-v10/boot/compressed/Makefile	2008-04-21 09:54:22.000000000 -0400
@@ -22,7 +22,7 @@ $(obj)/decompress.bin: $(obj)/decompress
 	$(call if_changed,objcopy)
 
 $(obj)/head.o: $(obj)/head.S .config
-	@$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
+	@$(CC) -D__ASSEMBLY__ -c $< -o $@
 
 $(obj)/misc.o: $(obj)/misc.c .config
 	@$(CC) -D__KERNEL__ -c $< -o $@
Index: linux-2.6-lttng/arch/cris/arch-v10/boot/rescue/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/cris/arch-v10/boot/rescue/Makefile	2008-04-21 09:54:29.000000000 -0400
+++ linux-2.6-lttng/arch/cris/arch-v10/boot/rescue/Makefile	2008-04-21 09:54:38.000000000 -0400
@@ -4,7 +4,6 @@
 
 CC = gcc-cris -mlinux $(LINUXINCLUDE)
 ccflags-y += -O2
-asflags-y += -traditional
 LD = gcc-cris -mlinux -nostdlib
 ldflags-y += -T $(obj)/rescue.ld
 OBJCOPY = objcopy-cris
Index: linux-2.6-lttng/arch/cris/arch-v10/lib/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/cris/arch-v10/lib/Makefile	2008-04-21 09:54:44.000000000 -0400
+++ linux-2.6-lttng/arch/cris/arch-v10/lib/Makefile	2008-04-21 09:54:53.000000000 -0400
@@ -2,8 +2,5 @@
 # Makefile for Etrax-specific library files..
 #
 
-
-EXTRA_AFLAGS := -traditional
-
 lib-y  = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
 

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 2/9] M32R remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: m32r-remove-traditional.patch --]
[-- Type: text/plain, Size: 1658 bytes --]

Subject: [RFC patch 2/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: takata@linux-m32r.org
CC: linux-m32r@ml.linux-m32r.org
---
 arch/m32r/boot/compressed/Makefile |    1 -
 arch/m32r/kernel/Makefile          |    2 --
 2 files changed, 3 deletions(-)

Index: linux-2.6-lttng/arch/m32r/boot/compressed/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m32r/boot/compressed/Makefile	2008-04-21 09:57:01.000000000 -0400
+++ linux-2.6-lttng/arch/m32r/boot/compressed/Makefile	2008-04-21 09:57:09.000000000 -0400
@@ -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
 
Index: linux-2.6-lttng/arch/m32r/kernel/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m32r/kernel/Makefile	2008-04-21 09:57:16.000000000 -0400
+++ linux-2.6-lttng/arch/m32r/kernel/Makefile	2008-04-21 09:57:22.000000000 -0400
@@ -9,5 +9,3 @@ obj-y	:= process.o entry.o traps.o align
 
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o
 obj-$(CONFIG_MODULES)		+= module.o
-
-EXTRA_AFLAGS	:= -traditional

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 3/9] H8300 remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: h8300-remove-traditional.patch --]
[-- Type: text/plain, Size: 1134 bytes --]

Subject: [RFC patch 3/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 arch/h8300/boot/compressed/Makefile |    1 -
 1 file changed, 1 deletion(-)

Index: linux-2.6-lttng/arch/h8300/boot/compressed/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/h8300/boot/compressed/Makefile	2008-04-21 09:58:17.000000000 -0400
+++ linux-2.6-lttng/arch/h8300/boot/compressed/Makefile	2008-04-21 09:58:23.000000000 -0400
@@ -5,7 +5,6 @@
 #
 
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS	:= -traditional
 
 OBJECTS = $(obj)/head.o $(obj)/misc.o
 

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 4/9] M68K remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: m68k-remove-traditional.patch --]
[-- Type: text/plain, Size: 3201 bytes --]

Subject: [RFC patch 4/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

(cross-compile test ok)

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: geert@linux-m68k.org
CC: zippel@linux-m68k.org
CC: linux-m68k@lists.linux-m68k.org
---
 arch/m68k/fpsp040/Makefile  |    1 -
 arch/m68k/ifpsp060/Makefile |    1 -
 arch/m68k/kernel/Makefile   |    2 --
 arch/m68k/lib/Makefile      |    2 --
 arch/m68k/math-emu/Makefile |    2 --
 5 files changed, 8 deletions(-)

Index: linux-2.6-lttng/arch/m68k/fpsp040/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/fpsp040/Makefile	2008-04-21 09:59:58.000000000 -0400
+++ linux-2.6-lttng/arch/m68k/fpsp040/Makefile	2008-04-21 10:00:05.000000000 -0400
@@ -10,7 +10,6 @@ obj-y    := bindec.o binstr.o decbin.o d
 	    x_bsun.o x_fline.o x_operr.o x_ovfl.o x_snan.o x_store.o \
 	    x_unfl.o x_unimp.o x_unsupp.o bugfix.o skeleton.o
 
-EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
 
 $(OS_OBJS): fpsp.h
Index: linux-2.6-lttng/arch/m68k/ifpsp060/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/ifpsp060/Makefile	2008-04-21 10:00:10.000000000 -0400
+++ linux-2.6-lttng/arch/m68k/ifpsp060/Makefile	2008-04-21 10:00:15.000000000 -0400
@@ -6,5 +6,4 @@
 
 obj-y := fskeleton.o iskeleton.o os.o
 
-EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
Index: linux-2.6-lttng/arch/m68k/kernel/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/kernel/Makefile	2008-04-21 10:00:19.000000000 -0400
+++ linux-2.6-lttng/arch/m68k/kernel/Makefile	2008-04-21 10:00:24.000000000 -0400
@@ -16,5 +16,3 @@ devres-y = ../../../kernel/irq/devres.o
 
 obj-$(CONFIG_PCI)	+= bios32.o
 obj-y$(CONFIG_MMU_SUN3) += dma.o	# no, it's not a typo
-
-EXTRA_AFLAGS := -traditional
Index: linux-2.6-lttng/arch/m68k/lib/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/lib/Makefile	2008-04-21 10:00:29.000000000 -0400
+++ linux-2.6-lttng/arch/m68k/lib/Makefile	2008-04-21 10:00:34.000000000 -0400
@@ -2,7 +2,5 @@
 # Makefile for m68k-specific library files..
 #
 
-EXTRA_AFLAGS := -traditional
-
 lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
 	   checksum.o string.o semaphore.o uaccess.o
Index: linux-2.6-lttng/arch/m68k/math-emu/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/m68k/math-emu/Makefile	2008-04-21 10:00:38.000000000 -0400
+++ linux-2.6-lttng/arch/m68k/math-emu/Makefile	2008-04-21 10:00:43.000000000 -0400
@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_AFLAGS := -traditional
-
 #EXTRA_AFLAGS += -DFPU_EMU_DEBUG
 #EXTRA_CFLAGS += -DFPU_EMU_DEBUG
 

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 5/9] PARISC remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: parisc-remove-traditional.patch --]
[-- Type: text/plain, Size: 1322 bytes --]

Subject: [RFC patch 5/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: kyle@parisc-linux.org
CC: matthew@wil.cx
CC: grundler@parisc-linux.org
CC: linux-parisc@vger.kernel.org
---
 arch/parisc/kernel/Makefile |    3 ---
 1 file changed, 3 deletions(-)

Index: linux-2.6-lttng/arch/parisc/kernel/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/parisc/kernel/Makefile	2008-04-21 10:01:47.000000000 -0400
+++ linux-2.6-lttng/arch/parisc/kernel/Makefile	2008-04-21 10:01:56.000000000 -0400
@@ -4,9 +4,6 @@
 
 extra-y			:= init_task.o head.o vmlinux.lds
 
-AFLAGS_entry.o	:= -traditional
-AFLAGS_pacache.o := -traditional
-
 obj-y	     	:= cache.o pacache.o setup.o traps.o time.o irq.o \
 		   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
 		   ptrace.o hardware.o inventory.o drivers.o semaphore.o \

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [RFC patch 5/9] PARISC remove -traditional

[Kyle McMartin]

On Tue, Apr 22, 2008 at 01:24:09PM -0400, Mathieu Desnoyers wrote:
> Subject: [RFC patch 5/9] Re: [PATCH] Stringify support commas
>  > This is a no-no for those archs that still use -traditional.
>  > > I dunno if this is a problem for you at the moment and the
>  > > right fix is anyway to nuke -traditional.
>  > > 
>  > >     Sam
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> CC: Sam Ravnborg <sam@ravnborg.org>
> CC: kyle@parisc-linux.org
> CC: matthew@wil.cx
> CC: grundler@parisc-linux.org
> CC: linux-parisc@vger.kernel.org

no. more work needs to be done to remove it. i have a patch already.

it would likely be smarter to just use a private stringify for the C
code for now.

Re: [RFC patch 5/9] PARISC remove -traditional

[Mathieu Desnoyers]

* Kyle McMartin (kyle@mcmartin.ca) wrote:
> On Tue, Apr 22, 2008 at 01:24:09PM -0400, Mathieu Desnoyers wrote:
> > Subject: [RFC patch 5/9] Re: [PATCH] Stringify support commas
> >  > This is a no-no for those archs that still use -traditional.
> >  > > I dunno if this is a problem for you at the moment and the
> >  > > right fix is anyway to nuke -traditional.
> >  > > 
> >  > >     Sam
> > 
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> > CC: Sam Ravnborg <sam@ravnborg.org>
> > CC: kyle@parisc-linux.org
> > CC: matthew@wil.cx
> > CC: grundler@parisc-linux.org
> > CC: linux-parisc@vger.kernel.org
> 
> no. more work needs to be done to remove it. i have a patch already.
> 
> it would likely be smarter to just use a private stringify for the C
> code for now.

OK, this is what I wanted to know.

Thanks,

Mathieu

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 6/9] POWERPC remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: powerpc-remove-traditional.patch --]
[-- Type: text/plain, Size: 1343 bytes --]

Subject: [RFC patch 6/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: paulus@samba.org
CC: linuxppc-dev@ozlabs.org
---
 arch/powerpc/boot/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-lttng/arch/powerpc/boot/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/powerpc/boot/Makefile	2008-04-21 10:03:05.000000000 -0400
+++ linux-2.6-lttng/arch/powerpc/boot/Makefile	2008-04-21 10:03:17.000000000 -0400
@@ -23,7 +23,7 @@ BOOTCFLAGS    := -Wall -Wundef -Wstrict-
 		 -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
+BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc
 
 ifdef CONFIG_DEBUG_INFO
 BOOTCFLAGS	+= -g

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [RFC patch 6/9] POWERPC remove -traditional

[Paul Mackerras]

Mathieu Desnoyers writes:
> Subject: [RFC patch 6/9] Re: [PATCH] Stringify support commas
>  > This is a no-no for those archs that still use -traditional.
>  > > I dunno if this is a problem for you at the moment and the
>  > > right fix is anyway to nuke -traditional.
>  > > 
>  > >     Sam
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> CC: Sam Ravnborg <sam@ravnborg.org>
> CC: paulus@samba.org
> CC: linuxppc-dev@ozlabs.org
> ---
>  arch/powerpc/boot/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Looks OK.  I'll put it in my tree.

Paul.

Re: [RFC patch 6/9] POWERPC remove -traditional

[Mathieu Desnoyers]

* Paul Mackerras (paulus@samba.org) wrote:
> Mathieu Desnoyers writes:
> > Subject: [RFC patch 6/9] Re: [PATCH] Stringify support commas
> >  > This is a no-no for those archs that still use -traditional.
> >  > > I dunno if this is a problem for you at the moment and the
> >  > > right fix is anyway to nuke -traditional.
> >  > > 
> >  > >     Sam
> > 
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> > CC: Sam Ravnborg <sam@ravnborg.org>
> > CC: paulus@samba.org
> > CC: linuxppc-dev@ozlabs.org
> > ---
> >  arch/powerpc/boot/Makefile |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Looks OK.  I'll put it in my tree.
> 
> Paul.

OK, although it won't be needed with v2 of the stringify with commas.
There seems to be some important details which differ between
-traditional and stdc gcc operation which makes it non-trivial to remove
the -traditional, at least on sparc. Maybe Kyle could tell us a bit more
about the nature of these limitations ?

I would wait a bit before merging until we at least identify what those
limitations are.

Mathieu

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[RFC patch 7/9] S390 remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: s390-remove-traditional.patch --]
[-- Type: text/plain, Size: 2204 bytes --]

Subject: [RFC patch 7/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

(cross-compile test ok)

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: schwidefsky@de.ibm.com
CC: heiko.carstens@de.ibm.com
CC: linux390@de.ibm.com
CC: linux-s390@vger.kernel.org
---
 arch/s390/kernel/Makefile   |    2 --
 arch/s390/lib/Makefile      |    2 --
 arch/s390/math-emu/Makefile |    1 -
 3 files changed, 5 deletions(-)

Index: linux-2.6-lttng/arch/s390/kernel/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/s390/kernel/Makefile	2008-04-21 10:04:43.000000000 -0400
+++ linux-2.6-lttng/arch/s390/kernel/Makefile	2008-04-21 10:04:47.000000000 -0400
@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_AFLAGS	:= -traditional
-
 #
 # Passing null pointers is ok for smp code, since we access the lowcore here.
 #
Index: linux-2.6-lttng/arch/s390/lib/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/s390/lib/Makefile	2008-04-21 10:04:55.000000000 -0400
+++ linux-2.6-lttng/arch/s390/lib/Makefile	2008-04-21 10:05:00.000000000 -0400
@@ -2,8 +2,6 @@
 # Makefile for s390-specific library files..
 #
 
-EXTRA_AFLAGS := -traditional
-
 lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
 obj-$(CONFIG_32BIT) += div64.o qrnnd.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
Index: linux-2.6-lttng/arch/s390/math-emu/Makefile
===================================================================
--- linux-2.6-lttng.orig/arch/s390/math-emu/Makefile	2008-04-21 10:05:04.000000000 -0400
+++ linux-2.6-lttng/arch/s390/math-emu/Makefile	2008-04-21 10:05:08.000000000 -0400
@@ -5,4 +5,3 @@
 obj-$(CONFIG_MATHEMU) := math.o
 
 EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
-EXTRA_AFLAGS := -traditional

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [RFC patch 7/9] S390 remove -traditional

[Heiko Carstens]

On Tue, Apr 22, 2008 at 01:24:11PM -0400, Mathieu Desnoyers wrote:
> Subject: [RFC patch 7/9] Re: [PATCH] Stringify support commas
>  > This is a no-no for those archs that still use -traditional.
>  > > I dunno if this is a problem for you at the moment and the
>  > > right fix is anyway to nuke -traditional.
>  > > 
>  > >     Sam
> 
> (cross-compile test ok)
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> CC: Sam Ravnborg <sam@ravnborg.org>
> CC: schwidefsky@de.ibm.com
> CC: heiko.carstens@de.ibm.com
> CC: linux390@de.ibm.com
> CC: linux-s390@vger.kernel.org
> ---
>  arch/s390/kernel/Makefile   |    2 --
>  arch/s390/lib/Makefile      |    2 --
>  arch/s390/math-emu/Makefile |    1 -
>  3 files changed, 5 deletions(-)
> 
> Index: linux-2.6-lttng/arch/s390/kernel/Makefile
> ===================================================================
> --- linux-2.6-lttng.orig/arch/s390/kernel/Makefile	2008-04-21 10:04:43.000000000 -0400
> +++ linux-2.6-lttng/arch/s390/kernel/Makefile	2008-04-21 10:04:47.000000000 -0400
> @@ -2,8 +2,6 @@
>  # Makefile for the linux kernel.
>  #
> 
> -EXTRA_AFLAGS	:= -traditional
> -

Thanks, applied. This did cause problems in late 2.6.25 and I think Martin
had a similar patch ready.

[RFC patch 8/9] SH remove -traditional

[Mathieu Desnoyers]

[-- Attachment #1: sh-remove-traditional.patch --]
[-- Type: text/plain, Size: 1756 bytes --]

Subject: [RFC patch 8/9] Re: [PATCH] Stringify support commas
 > This is a no-no for those archs that still use -traditional.
 > > I dunno if this is a problem for you at the moment and the
 > > right fix is anyway to nuke -traditional.
 > > 
 > >     Sam

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: lethal@linux-sh.org
CC: linux-sh@vger.kernel.org
---
 arch/sh/boot/compressed/Makefile_32 |    1 -
 arch/sh/boot/compressed/Makefile_64 |    1 -
 2 files changed, 2 deletions(-)

Index: linux-2.6-lttng/arch/sh/boot/compressed/Makefile_32
===================================================================
--- linux-2.6-lttng.orig/arch/sh/boot/compressed/Makefile_32	2008-04-21 10:07:12.000000000 -0400
+++ linux-2.6-lttng/arch/sh/boot/compressed/Makefile_32	2008-04-21 10:07:17.000000000 -0400
@@ -6,7 +6,6 @@
 
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \
 		   head_32.o misc_32.o piggy.o
-EXTRA_AFLAGS	:= -traditional
 
 OBJECTS = $(obj)/head_32.o $(obj)/misc_32.o
 
Index: linux-2.6-lttng/arch/sh/boot/compressed/Makefile_64
===================================================================
--- linux-2.6-lttng.orig/arch/sh/boot/compressed/Makefile_64	2008-04-21 10:07:12.000000000 -0400
+++ linux-2.6-lttng/arch/sh/boot/compressed/Makefile_64	2008-04-21 10:07:17.000000000 -0400
@@ -13,7 +13,6 @@
 
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \
 		   head_64.o misc_64.o cache.o piggy.o
-EXTRA_AFLAGS	:= -traditional
 
 OBJECTS		:= $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \
 		   $(obj)/cache.o

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [RFC patch 8/9] SH remove -traditional

[Paul Mundt]

On Tue, Apr 22, 2008 at 01:24:12PM -0400, Mathieu Desnoyers wrote:
> Subject: [RFC patch 8/9] Re: [PATCH] Stringify support commas
>  > This is a no-no for those archs that still use -traditional.
>  > > I dunno if this is a problem for you at the moment and the
>  > > right fix is anyway to nuke -traditional.
>  > > 
>  > >     Sam
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> CC: Sam Ravnborg <sam@ravnborg.org>
> CC: lethal@linux-sh.org
> CC: linux-sh@vger.kernel.org
> ---
>  arch/sh/boot/compressed/Makefile_32 |    1 -
>  arch/sh/boot/compressed/Makefile_64 |    1 -
>  2 files changed, 2 deletions(-)
> 
Oops, these must have snuck back in during the sh64 integration, I
thought I had killed them all off already. Applied, thanks.

[RFC patch 9/9] Stringify support commas

[Mathieu Desnoyers]

[-- Attachment #1: stringify-support-commas.patch --]
[-- Type: text/plain, Size: 1210 bytes --]

#define MYDEF a, b, c

__stringify(MYDEF) should be replaced by "a, b, c", but compilation fails
because the __stringify macro expects only one argument. Fix it by using
variable macro arguments in __stringify and __stringify_1.

Needed in my current NMI safe iret paravirt support work so I can expand
a macro containing assembly code into a string.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: akpm@osdl.org
---
 include/linux/stringify.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-lttng/include/linux/stringify.h
===================================================================
--- linux-2.6-lttng.orig/include/linux/stringify.h	2008-04-20 14:25:12.000000000 -0400
+++ linux-2.6-lttng/include/linux/stringify.h	2008-04-20 14:25:33.000000000 -0400
@@ -6,7 +6,7 @@
  * converts to "bar".
  */
 
-#define __stringify_1(x)	#x
-#define __stringify(x)		__stringify_1(x)
+#define __stringify_1(x...)	#x
+#define __stringify(x...)	__stringify_1(x)
 
 #endif	/* !__LINUX_STRINGIFY_H */

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68