From patchwork Sun Jun 3 12:25:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 162509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 24270B7034 for ; Sun, 3 Jun 2012 23:19:12 +1000 (EST) Received: from localhost ([::1]:47261 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbAi5-0004vF-P7 for incoming@patchwork.ozlabs.org; Sun, 03 Jun 2012 09:19:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sb9tw-0002Qx-RG for qemu-devel@nongnu.org; Sun, 03 Jun 2012 08:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sb9tv-0001vC-7u for qemu-devel@nongnu.org; Sun, 03 Jun 2012 08:27:20 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:46386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sb9tu-0001Fa-W0 for qemu-devel@nongnu.org; Sun, 03 Jun 2012 08:27:19 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so5284248pbb.4 for ; Sun, 03 Jun 2012 05:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=ctGIOuoDcRHOAl04QYODKdILtqSVXT+SRXZz5oMYE6Q=; b=J9zXJyTqSUpH3wIqYFoNVYQuG9T8BWRtEOLQudow7prOAJKFgLTwxaQ2IXE8wUEMHX uH0B2BUheTCuy0gaDC8QwYEGbcdrbq195bwyjtcYh3ITmM4FfPlY3IyTVU829c802u1x XHEogR5RjeMy2i8HgXKTwrKCnNoBprtkwr9p//YIfMCZFYQxHwt2KvLXlYJlzSkYzaNw x3bGnoazXu+8fru70xavihZWNfNMssAkHGYgntxla7U1jtkt/MaIZrw4f826CYS/ZkIv lsCZpLr57zfZTvDjVTNQEC/CN2raHwYPUYfsjQXcCszbgJnHMZXb/w+t0KrCI5vdprdt XCYw== Received: by 10.68.217.233 with SMTP id pb9mr12299392pbc.121.1338726438146; Sun, 03 Jun 2012 05:27:18 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-204-25.ip51.fastwebnet.it. [93.34.204.25]) by mx.google.com with ESMTPS id b10sm9560854pbr.46.2012.06.03.05.27.15 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 03 Jun 2012 05:27:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 3 Jun 2012 14:25:58 +0200 Message-Id: <1338726358-30681-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1338726358-30681-1-git-send-email-pbonzini@redhat.com> References: <1338726358-30681-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Subject: [Qemu-devel] [PATCH 24/24] compile oslib-obj-y once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There is no difference in oslib-obj-y between user-mode and system targets. There used to be when user-mode could optionally be compiled with PIE. Signed-off-by: Paolo Bonzini --- Makefile.objs | 3 ++- Makefile.target | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index b91d4f4..797c440 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -22,6 +22,8 @@ oslib-obj-y = osdep.o oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o +universal-obj-y += $(oslib-obj-y) + ####################################################################### # coroutines coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o @@ -63,7 +65,6 @@ common-obj-y += net.o net/ common-obj-y += qom/ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += readline.o console.o cursor.o -common-obj-y += $(oslib-obj-y) common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o diff --git a/Makefile.target b/Makefile.target index 78147c3..98b4054 100644 --- a/Makefile.target +++ b/Makefile.target @@ -101,7 +101,7 @@ ifdef CONFIG_LINUX_USER QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user obj-y += linux-user/ -obj-y += gdbstub.o thunk.o user-exec.o $(oslib-obj-y) +obj-y += gdbstub.o thunk.o user-exec.o endif #CONFIG_LINUX_USER