From patchwork Wed Feb 19 22:03:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11392733 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B0E8924 for ; Wed, 19 Feb 2020 22:05:46 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D9F052465D for ; Wed, 19 Feb 2020 22:05:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9F052465D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4XTU-0006Kd-Id for patchwork-qemu-devel@patchwork.kernel.org; Wed, 19 Feb 2020 17:05:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34160) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4XSF-0004ep-BY for qemu-devel@nongnu.org; Wed, 19 Feb 2020 17:04:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4XSE-0001Y5-44 for qemu-devel@nongnu.org; Wed, 19 Feb 2020 17:04:27 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:60391) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4XSB-0001Wc-8o; Wed, 19 Feb 2020 17:04:23 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MQ8OG-1irOIx09PU-00M8Ed; Wed, 19 Feb 2020 23:03:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 01/20] linux-user: introduce parameters to generate syscall_nr.h Date: Wed, 19 Feb 2020 23:03:14 +0100 Message-Id: <20200219220333.1411905-2-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219220333.1411905-1-laurent@vivier.eu> References: <20200219220333.1411905-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EZ1DzYDfgTQrUlN1OWMWVVPjaJhLLPoykx3fDPYO82vnEsJ6lXT 0U/A2Pifolv68qFWUQCzfzX//gV1PUEXPRNKm//k76OT7Ll3uM/41SUmJtn7iFNbNMmxUdU M97hj0YtA7VZ6vd0rt6BOcvb9Dwo1C8VOxL6qm63bKymwB2/VT0o28KH7slFEmIVKxDVuQX 8x7tI/GST4Z07CA2LF4qw== X-UI-Out-Filterresults: notjunk:1;V03:K0:hqngFSB4ULU=:FV/YXf7yDyk/1zzveOnp7O 7CPGob/EyF6bmobb5Yg6NhT59zvPRKkfuKVnI1OHI3hiuz8xJseQJkn/+2x5GRSdkB9XGW3dz jHD1Mnien1Kxj1Qh9xTR6i2uTvdZeCViUQeXdMXuXWPa57YldrKgMguLyXuqrwo+wqabWoi7x vGkgkQWckZdwhHbqEhqdODGO2o2uKtL/Vfdn4wcgWAR/BVM7Cr0uPpEI1LZz26Dpn1IVvnPld VMYsK9a1/BPM0L/XnzMmonOHeCPJH4Jf+RPh0ddKndSelJd8tG/xZijsewoCHVNITZ2dw5tNN 0XZbcW+WWuIhE06Kfxo44iuO2MDPihi4PXVGvU5eW3EJmQpZyWLFYrfkxax4anPyvH3OUfZCr MHZHCBSeVw8k5jhCsUu1KlWVXap2RTPODTbzIegh6kTEJQdhwdjr2B2Bq34EN4gVWZj5oMOfk oHK9xMX9tCy4ubtrL5WEhs1ripZzOYQl4Ttps2f6rjYL3Ua+PTNLXhA+dm27M/pkfCWq33TYI p5DIDavP3cj35iF1ZBoIXLdIOFZDyiUHnxfiy/DDnVPzKYVj7euJnx6IbvQfkeQiPkLFylXC6 6lrgcS6JzN7oSzW+Au42dqVWrLo8XnQGgiXEEti1yk0UNGOo3VenLqmGQfMH9AK9c3t8yVf6+ IxtvmXlTMZfrn9iGVhzmLZ4R0S5cgHvPeUxm4SPUZDe7/IwYjsgJ9hwxospGy4o9UyEn/RYkm JKwPEiaFeoNDHVSqD4INkRRnuE2PD1pVwp1XlzPhTuvzfw599yVwf5llpI82dYdnLhh4knDpQ 3+iXn6nSSqPRemrpK+eoKQf8DfdFgn1O0PL0g3boJLwVyz/+Xca+qDShURoWvCZUQ0OWCqi X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 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: Cornelia Huck , Riku Voipio , Laurent Vivier , qemu-s390x@nongnu.org, Aleksandar Markovic , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This will be used when we'll import syscall.tbl from the kernel Add a script to remove all the dependencies to syscall_nr.h that point to source directory and not to the build directory. The list of arch will be update while the generated files are added. Signed-off-by: Laurent Vivier --- Notes: v2: add script to remove dependencies to syscall_nr.h in source directory Makefile.target | 3 ++- configure | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile.target b/Makefile.target index 6e61f607b14a..9babf2643e0b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -128,7 +128,8 @@ ifdef CONFIG_LINUX_USER QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/linux-user/host/$(ARCH) \ - -I$(SRC_PATH)/linux-user + -I$(SRC_PATH)/linux-user \ + -Ilinux-user/$(TARGET_ABI_DIR) obj-y += linux-user/ obj-y += gdbstub.o thunk.o diff --git a/configure b/configure index 6f5d85094965..795adf41195f 100755 --- a/configure +++ b/configure @@ -1855,6 +1855,17 @@ fi # Remove old dependency files to make sure that they get properly regenerated rm -f */config-devices.mak.d +# Remove syscall_nr.h to be sure they will be regenerated in the build +# directory, not in the source directory +for arch in ; do + # remove the file if it has been generated in the source directory + rm -f "${source_path}/linux-user/${arch}/syscall_nr.h" + # remove the dependency files + find . -name "*.d" \ + -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {} \; \ + -exec rm {} \; +done + if test -z "$python" then error_exit "Python not found. Use --python=/path/to/python" @@ -7829,6 +7840,9 @@ echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak if [ "$HOST_VARIANT_DIR" != "" ]; then echo "HOST_VARIANT_DIR=$HOST_VARIANT_DIR" >> $config_target_mak fi +if [ "$TARGET_SYSTBL_ABI" != "" ]; then + echo "TARGET_SYSTBL_ABI=$TARGET_SYSTBL_ABI" >> $config_target_mak +fi if supported_xen_target $target; then echo "CONFIG_XEN=y" >> $config_target_mak