2.6.27.58-stable review patch. If anyone has any objections, please let us know.
------------------ From: H. Peter Anvin <[email protected]> commit de2a8cf98ecdde25231d6c5e7901e2cffaf32af9 upstream. 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 <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]> LKML-Reference: <tip-*@git.kernel.org> Signed-off-by: Greg Kroah-Hartman <[email protected]> Index: longterm-2.6.27/arch/x86/vdso/Makefile =================================================================== --- longterm-2.6.27.orig/arch/x86/vdso/Makefile 2011-01-29 11:19:14.676064283 +0100 +++ longterm-2.6.27/arch/x86/vdso/Makefile 2011-01-29 11:27:24.890063749 +0100 @@ -25,7 +25,7 @@ export CPPFLAGS_vdso.lds += -P -C -VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -Wl,-soname=linux-vdso.so.1 \ +VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \ -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so @@ -69,7 +69,7 @@ vdso32-images = $(vdso32.so-y:%=vdso32-%.so) CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds) -VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1 +VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-soname=linux-gate.so.1 # This makes sure the $(obj) subdirectory exists even though vdso32/ # is not a kbuild sub-make subdirectory. _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
