From patchwork Wed Dec 16 14:20:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 41271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E13EEB7B5F for ; Thu, 17 Dec 2009 01:57:53 +1100 (EST) Received: from localhost ([127.0.0.1]:48071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKvK1-00056X-Qo for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2009 09:57:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKukN-0000Oo-AS for qemu-devel@nongnu.org; Wed, 16 Dec 2009 09:20:59 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKukI-0000Le-D0 for qemu-devel@nongnu.org; Wed, 16 Dec 2009 09:20:58 -0500 Received: from [199.232.76.173] (port=44539 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKukI-0000LX-7e for qemu-devel@nongnu.org; Wed, 16 Dec 2009 09:20:54 -0500 Received: from mail-fx0-f222.google.com ([209.85.220.222]:39619) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKukH-0001R2-TH for qemu-devel@nongnu.org; Wed, 16 Dec 2009 09:20:54 -0500 Received: by fxm22 with SMTP id 22so962516fxm.2 for ; Wed, 16 Dec 2009 06:20:52 -0800 (PST) Received: by 10.223.5.87 with SMTP id 23mr1239113fau.87.1260973251994; Wed, 16 Dec 2009 06:20:51 -0800 (PST) Received: from localhost.localdomain (a88-114-220-92.elisa-laajakaista.fi [88.114.220.92]) by mx.google.com with ESMTPS id f31sm1599697fkf.12.2009.12.16.06.20.50 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Dec 2009 06:20:51 -0800 (PST) From: "Kirill A. Shutemov" To: qemu-devel@nongnu.org Date: Wed, 16 Dec 2009 16:20:34 +0200 Message-Id: <1260973234-12601-1-git-send-email-kirill@shutemov.name> X-Mailer: git-send-email 1.6.5.6 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Blue Swirl , "Kirill A. Shutemov" , Juan Quintela Subject: [Qemu-devel] [PATCH] user_only: compile everything with -fpie X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Cc: Blue Swirl Signed-off-by: Juan Quintela --- 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