From nobody Mon Feb 9 12:14:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576758707; cv=none; d=zohomail.com; s=zohoarc; b=F1fOPN8p2ck5I/bFhxwg6kRIkdkkBX4YenzgyQaBJueZs4c3LrxYoBP5Bf3RdVs/tH9FCyBwcQIjLy+28xFR1UeFl9P6dodC7RAhI5e+v/hqo/vn6BuSYszaxEc7uoamuiqgun83uuCZtzVqG6a/dJ+sz0IBpzILzN9irqgK8CA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576758707; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kp9bVNFjrivXHia4Yh8td83EMWOHenrJjacQknfP6M0=; b=IzyS51cnml0fgr+myLkqioDOAhli5GiqSVviB2fJbObzx0oeUsWFXy6hrpdKwTdDmf/bW10dSFy6dIWggRPlR6EuoCTdESAywN09vd2KTMVe1+8Df/KV5MGd3hU7Q35k+08Qv+ten7KLeNKwFbjWkiV9brtD5Y8d1RyTwSd1Tqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576758707169223.84152336018508; Thu, 19 Dec 2019 04:31:47 -0800 (PST) Received: from localhost ([::1]:40140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuy1-00085w-80 for importer@patchew.org; Thu, 19 Dec 2019 07:31:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33642) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihurT-0008JY-6C for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:25:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihurR-0000gR-SG for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:58 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23372 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 1ihurR-0000dQ-L1 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:57 -0500 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-244-gWNlDfbmOq-l13EueBbpzw-1; Thu, 19 Dec 2019 07:24:54 -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 7C7AA184BECC for ; Thu, 19 Dec 2019 12:24:53 +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 2625D60C18; Thu, 19 Dec 2019 12:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758297; 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=Kp9bVNFjrivXHia4Yh8td83EMWOHenrJjacQknfP6M0=; b=B5k/h+3CRIxSxj078qUbOjD9d4+VMvd3Mh9Pl6VH8VZPmTcbpHJZCD0sKY6NG9rEHrkXLQ FksFvalZfo8adp3MZ4RMcyZFvOhC+dZDttRzrqjQvzz5HVb3TvDjh7bya8Gheqpap/rx5U aaNiEF+LyX32Vgzg9jqVNbccg+xlaRc= From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 109/132] meson: bsd-user Date: Thu, 19 Dec 2019 13:23:29 +0100 Message-Id: <1576758232-12439-18-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: gWNlDfbmOq-l13EueBbpzw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile.target | 3 --- bsd-user/Makefile.objs | 2 -- bsd-user/meson.build | 10 ++++++++++ meson.build | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 bsd-user/Makefile.objs create mode 100644 bsd-user/meson.build diff --git a/Makefile.target b/Makefile.target index a8e6a28..0eca5f8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -138,9 +138,6 @@ ifdef CONFIG_BSD_USER QEMU_CFLAGS+=3D-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_= DIR) \ -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) =20 -obj-y +=3D bsd-user/ -obj-y +=3D gdbstub.o - endif #CONFIG_BSD_USER =20 ######################################################### diff --git a/bsd-user/Makefile.objs b/bsd-user/Makefile.objs deleted file mode 100644 index 5e77f57..0000000 --- a/bsd-user/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y =3D main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ - uaccess.o diff --git a/bsd-user/meson.build b/bsd-user/meson.build new file mode 100644 index 0000000..0369549 --- /dev/null +++ b/bsd-user/meson.build @@ -0,0 +1,10 @@ +bsd_user_ss.add(files( + 'bsdload.c', + 'elfload.c', + 'main.c', + 'mmap.c', + 'signal.c', + 'strace.c', + 'syscall.c', + 'uaccess.c', +)) diff --git a/meson.build b/meson.build index 64cbab1..31c9591 100644 --- a/meson.build +++ b/meson.build @@ -646,8 +646,12 @@ subdir('hw') subdir('libdecnumber') subdir('target') subdir('accel') +subdir('bsd-user') subdir('linux-user') =20 +bsd_user_ss.add(files('gdbstub.c')) +specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) + linux_user_ss.add(files('gdbstub.c', 'thunk.c')) specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) =20 --=20 1.8.3.1