From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NKLvo-0001Ac-Oh
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 20:10:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NKLvk-0001A8-6w
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 20:10:28 -0500
Received: from [199.232.76.173] (port=44813 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NKLvk-0001A5-3c
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 20:10:24 -0500
Received: from mail-fx0-f222.google.com ([209.85.220.222]:40670)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kirill@shutemov.name>) id 1NKLvj-0008Aq-QZ
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 20:10:23 -0500
Received: by fxm22 with SMTP id 22so9883903fxm.2
	for <qemu-devel@nongnu.org>; Mon, 14 Dec 2009 17:10:21 -0800 (PST)
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Date: Tue, 15 Dec 2009 03:10:04 +0200
Message-Id: <1260839404-28622-1-git-send-email-kirill@shutemov.name>
Subject: [Qemu-devel] [PATCH] Fix TEXTREL in user targets when compiled with
	--enable-user-pie
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Blue Swirl <blauwirbel@gmail.com>, "Kirill A. Shutemov" <kirill@shutemov.name>

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.

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Blue Swirl <blauwirbel@gmail.com>
---
 Makefile.user |    4 ++--
 configure     |    1 +
 2 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
 
 .PHONY: all
 
-VPATH=$(SRC_PATH)
+vpath %.c $(SRC_PATH)
 
-QEMU_CFLAGS+=-I..
+QEMU_CFLAGS+=-I$(SRC_PATH)/ $(CFLAGS_PIE)
 
 obj-y =
 obj-y += 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" = "yes" -a "$static" = "no" -a \
 	"$user_pie" = "yes" ; then
   cflags="-fpie $cflags"
   ldflags="-pie $ldflags"
+  echo "CFLAGS_PIE=-fpie" >> $config_host_mak
 fi
 
 if test "$target_softmmu" = "yes" -a \( \
-- 
1.6.5.6