From patchwork Thu Dec 19 12:23:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1213303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="RYBIQcLr"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dryQ0l1Tz9sPc for ; Thu, 19 Dec 2019 23:38:22 +1100 (AEDT) Received: from localhost ([::1]:40242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihv4N-0008WT-Ei for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 07:38:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34404) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurZ-0008Tb-TA for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurY-0001HB-9w for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:05 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:32145 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihurX-0001Dj-V2 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qf0EzKe6oLRsH/L+PXJBFfkGsboS7PCszn0vT0Ecovc=; b=RYBIQcLrteGmsE3O5fjpQzYBb+b05dFM72KuR2UN2i2id5jt++5hZ6O7rFrT+r+NDJwf/n OpwBOZeLToGXyJttK6hnkbJqDl9Q7oA5JPrig657Vnf4EL/vIx5UTj7sz1JP6uYF5Lepme 7+A2ROb7s5JmjRj5KLwHfXRw805/m4k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-Mpwd7xGmOmS5pwUudlOfOg-1; Thu, 19 Dec 2019 07:24:48 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21487107ACC9 for ; Thu, 19 Dec 2019 12:24:47 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id A927060C18; Thu, 19 Dec 2019 12:24:45 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 108/132] meson: linux-user Date: Thu, 19 Dec 2019 13:23:28 +0100 Message-Id: <1576758232-12439-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Mpwd7xGmOmS5pwUudlOfOg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Acked-by: Laurent Vivier --- Makefile.target | 3 --- linux-user/Makefile.objs | 10 ---------- linux-user/arm/nwfpe/Makefile.objs | 2 -- linux-user/arm/nwfpe/meson.build | 10 ++++++++++ linux-user/meson.build | 22 ++++++++++++++++++++++ meson.build | 4 ++++ 6 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 linux-user/Makefile.objs delete mode 100644 linux-user/arm/nwfpe/Makefile.objs create mode 100644 linux-user/arm/nwfpe/meson.build create mode 100644 linux-user/meson.build diff --git a/Makefile.target b/Makefile.target index 438d27b..a8e6a28 100644 --- a/Makefile.target +++ b/Makefile.target @@ -128,9 +128,6 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/linux-user/host/$(ARCH) \ -I$(SRC_PATH)/linux-user -obj-y += linux-user/ -obj-y += gdbstub.o thunk.o - endif #CONFIG_LINUX_USER ######################################################### diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs deleted file mode 100644 index d2f33be..0000000 --- a/linux-user/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -obj-y = main.o syscall.o strace.o mmap.o signal.o \ - elfload.o linuxload.o uaccess.o uname.o \ - safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o exit.o fd-trans.o - -obj-$(TARGET_HAS_BFLT) += flatload.o -obj-$(TARGET_I386) += vm86.o -obj-$(TARGET_ARM) += arm/nwfpe/ -obj-$(TARGET_ARM) += arm/semihost.o -obj-$(TARGET_AARCH64) += arm/semihost.o diff --git a/linux-user/arm/nwfpe/Makefile.objs b/linux-user/arm/nwfpe/Makefile.objs deleted file mode 100644 index 51b0c32..0000000 --- a/linux-user/arm/nwfpe/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o -obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o diff --git a/linux-user/arm/nwfpe/meson.build b/linux-user/arm/nwfpe/meson.build new file mode 100644 index 0000000..1c27e55 --- /dev/null +++ b/linux-user/arm/nwfpe/meson.build @@ -0,0 +1,10 @@ +linux_user_ss.add(when: 'TARGET_ARM', if_true: files( + 'double_cpdo.c', + 'extended_cpdo.c', + 'fpa11.c', + 'fpa11_cpdo.c', + 'fpa11_cpdt.c', + 'fpa11_cprt.c', + 'fpopcode.c', + 'single_cpdo.c', +)) diff --git a/linux-user/meson.build b/linux-user/meson.build new file mode 100644 index 0000000..b5711d9 --- /dev/null +++ b/linux-user/meson.build @@ -0,0 +1,22 @@ +linux_user_ss.add(files( + 'elfload.c', + 'exit.c', + 'fd-trans.c', + 'linuxload.c', + 'main.c', + 'mmap.c', + 'safe-syscall.S', + 'signal.c', + 'strace.c', + 'syscall.c', + 'uaccess.c', + 'uname.c', +)) +linux_user_ss.add(rt) + +linux_user_ss.add(when: 'TARGET_AARCH64', if_true: files('arm/semihost.c')) +linux_user_ss.add(when: 'TARGET_ARM', if_true: files('arm/semihost.c')) +linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c')) +linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c')) + +subdir('arm/nwfpe') diff --git a/meson.build b/meson.build index 1c9a941..64cbab1 100644 --- a/meson.build +++ b/meson.build @@ -646,6 +646,10 @@ subdir('hw') subdir('libdecnumber') subdir('target') subdir('accel') +subdir('linux-user') + +linux_user_ss.add(files('gdbstub.c', 'thunk.c')) +specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) mods = [] block_mods = []