From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:59740)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <vilanova@ac.upc.edu>) id 1R4Dsu-0004dt-UZ
	for qemu-devel@nongnu.org; Thu, 15 Sep 2011 11:29:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <vilanova@ac.upc.edu>) id 1R4Dsm-0001j0-KU
	for qemu-devel@nongnu.org; Thu, 15 Sep 2011 11:29:52 -0400
Received: from gw.ac.upc.es ([147.83.30.3]:47639 helo=gw.ac.upc.edu)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <vilanova@ac.upc.edu>) id 1R4Dsm-0001in-CL
	for qemu-devel@nongnu.org; Thu, 15 Sep 2011 11:29:44 -0400
From: =?utf-8?b?TGx1w61z?= Vilanova <vilanova@ac.upc.edu>
Date: Thu, 15 Sep 2011 17:28:41 +0200
Message-ID: <20110915152840.25930.35350.stgit@ginnungagap.bsc.es>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PATCH] build: Move tracing objects into libuser on
	usermode	emulation targets
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <rth@twiddle.net>

This will apply libuser-specific compilation flags (like the ones added b=
y
--enable-user-pie), but keep softmmu emulation targets "as-is".

Signed-off-by: Llu=C3=ADs Vilanova <vilanova@ac.upc.edu>
---
 Makefile.objs   |    1 +
 Makefile.target |    2 +-
 Makefile.user   |    4 +++-
 configure       |    1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 62020d7..fb11fba 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -177,6 +177,7 @@ user-obj-y =3D
 user-obj-y +=3D envlist.o path.o
 user-obj-y +=3D tcg-runtime.o host-utils.o
 user-obj-y +=3D cutils.o cache-utils.o
+user-obj-y +=3D $(trace-obj-y)
=20
 ######################################################################
 # libhw
diff --git a/Makefile.target b/Makefile.target
index f708453..88d2f1f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -383,6 +383,7 @@ obj-y +=3D $(addprefix ../, $(common-obj-y))
 obj-y +=3D $(addprefix ../libdis/, $(libdis-y))
 obj-y +=3D $(libobj-y)
 obj-y +=3D $(addprefix $(HWDIR)/, $(hw-obj-y))
+obj-y +=3D $(addprefix ../, $(trace-obj-y))
=20
 endif # CONFIG_SOFTMMU
=20
@@ -394,7 +395,6 @@ obj-$(CONFIG_SMARTCARD_NSS) +=3D $(addprefix ../libca=
card/, $(libcacard-y))
 endif # CONFIG_BSD_USER
 endif # CONFIG_LINUX_USER
=20
-obj-y +=3D $(addprefix ../, $(trace-obj-y))
 obj-$(CONFIG_GDBSTUB_XML) +=3D gdbstub-xml.o
=20
 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
diff --git a/Makefile.user b/Makefile.user
index 024b773..2b1e4d1 100644
--- a/Makefile.user
+++ b/Makefile.user
@@ -17,7 +17,9 @@ all: $(user-obj-y)
 	@true
=20
 clean:
-	rm -f *.o *.d *.a *~
+	for d in . trace; do \
+	rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \
+	done
=20
 # Include automatically generated dependency files
 -include $(wildcard *.d */*.d)
diff --git a/configure b/configure
index 0875f95..ad924c4 100755
--- a/configure
+++ b/configure
@@ -3669,6 +3669,7 @@ fi
=20
 d=3Dlibuser
 mkdir -p $d
+mkdir -p $d/trace
 symlink $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