[Xen-changelog] [linux-2.6.18-xen] x86, gcc-4.6: Use gcc -m options when building vdso

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
# Date 1387550369 -3600
# Node ID 738b5b5d1473fa6216061e2b01a04eaf32065c2c
# Parent  c27b59a05b12679b05fef74b56a7b19ca31e791b
x86, gcc-4.6: Use gcc -m options when building vdso

The vdso Makefile passes linker-style -m options not to the linker but
to gcc.  This happens to work with earlier gcc, but fails with gcc
4.6.  Pass gcc-style -m options, instead.

Note: all currently supported versions of gcc supports -m32, so there
is no reason to conditionalize it any more.

Reported-by: H. J. Lu <hjl.tools@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>

upstream commit de2a8cf98ecdde25231d6c5e7901e2cffaf32af9
(only 32-bit part is applicable here)

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Committed-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r c27b59a05b12 -r 738b5b5d1473 arch/i386/kernel/Makefile
--- a/arch/i386/kernel/Makefile Mon Dec 16 13:38:06 2013 +0100
+++ b/arch/i386/kernel/Makefile Fri Dec 20 15:39:29 2013 +0100
@@ -54,7 +54,7 @@ targets += vsyscall-note.o vsyscall.lds
 
 # The DSO images are built using a special linker script.
 quiet_cmd_syscall = SYSCALL $@
-      cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \
+      cmd_syscall = $(CC) -m32 -nostdlib $(SYSCFLAGS_$(@F)) \
                          -Wl,-T,$(filter-out FORCE,$^) -o $@
 
 export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog