From patchwork Wed Jun 6 06:36:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163283 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 ECA20B6F9A for ; Wed, 6 Jun 2012 17:41:47 +1000 (EST) Received: from localhost ([::1]:56208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9sj-0004kr-PN for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 02:38:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9sG-0003zM-CV for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9sE-0002KY-FE for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:43 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9sE-000290-62 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:42 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so9244268pbb.4 for ; Tue, 05 Jun 2012 23:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=zlAQKARrlvq4pZ/O+6hHkw00CANm/QPHwa8RogFSzGo=; b=y3TmJB71CMyImAfsI5G0KkuLBJcWVQoUkMaogRlgBeg9OySCrYDsQng+BRbsuqS2fX iF+A4BZvL9D1SnFIXFXSv9Tyr15skrbTrfOGZKxEFIAJIm6+7kuza1BJ22lG7orZXdPw Zu8BLOYwcxA/1bkGUW6VLf84cvKM0hpV4CsF2/qcsO6DLUF8cgzIYlc4xBj1XGh2oix8 tntZa3NvO6u+4rXJ9gR1Wr2KkvUQuMqok+YGAodKRhmer2KNG6QCD6AGYwIRyJnkmpkH LUuMFVkcPqAbVSR6EaAacpk/CQDyCQIP/QkqOM+9B808gpw8Y+YzJ6eoft0HBDRBM7Ca qeMw== Received: by 10.68.233.193 with SMTP id ty1mr55478404pbc.47.1338964661134; Tue, 05 Jun 2012 23:37:41 -0700 (PDT) Received: from yakj.usersys.redhat.com.usersys.redhat.com (p40081-ipngn402hodogaya.kanagawa.ocn.ne.jp. [180.23.161.81]) by mx.google.com with ESMTPS id py5sm1479093pbb.1.2012.06.05.23.37.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 23:37:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 08:36:31 +0200 Message-Id: <1338964592-22223-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> References: <1338964592-22223-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 Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 24/25] build: 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 74110dd..8e72f09 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 @@ -62,7 +64,6 @@ common-obj-y = $(block-obj-y) blockdev.o common-obj-y += net.o net/ common-obj-y += qom/ 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 cfbd265..1b4ac98 100644 --- a/Makefile.target +++ b/Makefile.target @@ -96,7 +96,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