rpms/kernel/devel linux-2.6-x86_64-vdso-compile-m32.patch, NONE, 1.1 kernel-2.6.spec, 1.2097, 1.2098

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29744

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-vdso-compile-m32.patch 
Log Message:
Fix broken x86-64 32bit vDSO (#186924)



linux-2.6-x86_64-vdso-compile-m32.patch:
 Makefile |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-x86_64-vdso-compile-m32.patch ---

/usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-int80.o' is incompatible with i386 output
/usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-syscall.o' is incompatible with i386 output
/usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-sysenter.o' is incompatible with i386 output

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=186924

--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile~	2006-03-27 16:20:58.000000000 -0500
+++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-03-27 16:22:44.000000000 -0500
@@ -2,6 +2,9 @@
 # Makefile for the ia32 kernel emulation subsystem.
 #
 
+# Avoid gcc -m64 -m32 ... foo.S
+AFLAGS := $(filter-out -m64, $(AFLAGS))
+
 obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \
 	ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o \
 	mmap32.o
@@ -29,3 +32,6 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.ld
 
 AFLAGS_vsyscall-sysenter.o = -m32
 AFLAGS_vsyscall-syscall.o = -m32
+AFLAGS_syscall32_syscall.o += -m64
+AFLAGS_ia32entry.o += -m64
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2097
retrieving revision 1.2098
diff -u -r1.2097 -r1.2098
--- kernel-2.6.spec	27 Mar 2006 21:46:15 -0000	1.2097
+++ kernel-2.6.spec	27 Mar 2006 21:53:24 -0000	1.2098
@@ -232,6 +232,7 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
+Patch208: linux-2.6-x86_64-vdso-compile-m32.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6-cell-numa-init.patch
@@ -741,6 +742,8 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
+# Fix broken x86-64 32bit vDSO (#186924)
+%patch208 -p1
 
 #
 # ppc64
@@ -1638,6 +1641,7 @@
 %changelog
 * Mon Mar 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-git13
+- Fix broken x86-64 32bit vDSO (#186924)
 
 * Sat Mar 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-git10