From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKeRj-0007B8-SR for qemu-devel@nongnu.org; Tue, 15 Dec 2009 15:56:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKeRe-000770-Qs for qemu-devel@nongnu.org; Tue, 15 Dec 2009 15:56:38 -0500 Received: from [199.232.76.173] (port=46645 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKeRe-00076x-Kr for qemu-devel@nongnu.org; Tue, 15 Dec 2009 15:56:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61079) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKeRe-0000FX-7U for qemu-devel@nongnu.org; Tue, 15 Dec 2009 15:56:34 -0500 From: Juan Quintela In-Reply-To: (Kirill A. Shutemov's message of "Tue, 15 Dec 2009 21:48:00 +0200") References: <1260839404-28622-1-git-send-email-kirill@shutemov.name> Date: Tue, 15 Dec 2009 21:55:33 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] Re: [PATCH] Fix TEXTREL in user targets when compiled with --enable-user-pie List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Kirill A. Shutemov" Cc: Blue Swirl , qemu-devel@nongnu.org "Kirill A. Shutemov" wrote: > Please, apply it. > > On Tue, Dec 15, 2009 at 3:10 AM, Kirill A. Shutemov > wrote: >> We really need compile _all_ sources for user target with -fpie when >> use --enable-user-pie. >> >> It's regression introduced by commit add16157d72454. >> Please, do not break it any more. Wishful thinking :p I bet that: a- Blue Swirl didn't do it on purpose b- our build system is very fragile, it will happens again.=20 Learn to live with it. >> Signed-off-by: Kirill A. Shutemov >> Cc: Blue Swirl >> --- >> =C2=A0Makefile.user | =C2=A0 =C2=A04 ++-- >> =C2=A0configure =C2=A0 =C2=A0 | =C2=A0 =C2=A01 + >> =C2=A02 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/Makefile.user b/Makefile.user >> index 907e74b..0be73df 100644 >> --- a/Makefile.user >> +++ b/Makefile.user >> @@ -5,9 +5,9 @@ include $(SRC_PATH)/rules.mak >> >> =C2=A0.PHONY: all >> >> -VPATH=3D$(SRC_PATH) >> +vpath %.c $(SRC_PATH) This change is needed? >> >> -QEMU_CFLAGS+=3D-I.. >> +QEMU_CFLAGS+=3D-I$(SRC_PATH)/ $(CFLAGS_PIE) Why do you change it? QEMU_CFLAGS has this value in configure QEMU_CFLAGS=3D"-I. -I\$(SRC_PATH) $QEMU_CFLAGS" >> >> =C2=A0obj-y =3D >> =C2=A0obj-y +=3D envlist.o path.o >> diff --git a/configure b/configure >> index 273b6b7..6200391 100755 >> --- a/configure >> +++ b/configure >> @@ -2555,6 +2555,7 @@ if test "$target_user_only" =3D "yes" -a "$static"= =3D "no" -a \ >> =C2=A0 =C2=A0 =C2=A0 =C2=A0"$user_pie" =3D "yes" ; then >> =C2=A0 cflags=3D"-fpie $cflags" >> =C2=A0 ldflags=3D"-pie $ldflags" >> + =C2=A0echo "CFLAGS_PIE=3D-fpie" >> $config_host_mak >> =C2=A0fi >> >> =C2=A0if test "$target_softmmu" =3D "yes" -a \( \ >> -- >> 1.6.5.6 >> >> Can you test this other patch: >>From bdc26201bb83df3786722a63c3caf387914f8539 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 15 Dec 2009 21:53:26 +0100 Subject: [PATCH] user_only: compile everything with -fpie Signed-off-by: Juan Quintela --- Makefile.user | 1 + configure | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile.user b/Makefile.user index 907e74b..e4b5def 100644 --- a/Makefile.user +++ b/Makefile.user @@ -2,6 +2,7 @@ include ../config-host.mak include $(SRC_PATH)/rules.mak +include config.mak .PHONY: all diff --git a/configure b/configure index cf1db86..d815c7a 100755 --- a/configure +++ b/configure @@ -2652,3 +2652,6 @@ d=3Dlibuser mkdir -p $d rm -f $d/Makefile ln -s $source_path/Makefile.user $d/Makefile +if test "$static" =3D "no" -a "$user_pie" =3D "yes" ; then + echo "QEMU_CFLAGS+=3D-fpie" > $d/config.mak +fi --=20 1.6.5.2