"Kirill A. Shutemov" <kir...@shutemov.name> wrote: > ping?
Blue or Anthony, please apply. Patch is needed to get libuser + pie working well. Later, Juan. > On Wed, Dec 16, 2009 at 4:20 PM, Kirill A. Shutemov > <kir...@shutemov.name> wrote: >> We really need compile _all_ sources for user target with -fpie when >> use --enable-user-pie. >> >> It's regression introduced by commit add16157d72454. >> >> Signed-off-by: Kirill A. Shutemov <kir...@shutemov.name> >> Cc: Blue Swirl <blauwir...@gmail.com> >> Signed-off-by: Juan Quintela <quint...@redhat.com> >> --- >> Makefile.user | 7 ++++++- >> configure | 3 +++ >> 2 files changed, 9 insertions(+), 1 deletions(-) >> >> diff --git a/Makefile.user b/Makefile.user >> index 907e74b..9e4f040 100644 >> --- a/Makefile.user >> +++ b/Makefile.user >> @@ -2,10 +2,15 @@ >> >> include ../config-host.mak >> include $(SRC_PATH)/rules.mak >> +include config.mak >> >> .PHONY: all >> >> -VPATH=$(SRC_PATH) >> +# Do not take %.o from $(SRC_PATH), only %.c and %.h >> +# All %.o for user targets should be built with -fpie, when >> +# configured with --enable-user-pie, so we don't want to >> +# take %.o from $(SRC_PATH), since they built without -fpie >> +vpath %.c %.h $(SRC_PATH) >> >> QEMU_CFLAGS+=-I.. >> >> diff --git a/configure b/configure >> index 273b6b7..5f463b0 100755 >> --- a/configure >> +++ b/configure >> @@ -2652,3 +2652,6 @@ d=libuser >> mkdir -p $d >> rm -f $d/Makefile >> ln -s $source_path/Makefile.user $d/Makefile >> +if test "$static" = "no" -a "$user_pie" = "yes" ; then >> + echo "QEMU_CFLAGS+=-fpie" > $d/config.mak >> +fi >> -- >> 1.6.5.6 >> >>
