From patchwork Tue Feb 25 12:15:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1244126 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=none (p=none dis=none) header.from=vivier.eu 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 48Rdgg24h6z9sPk for ; Tue, 25 Feb 2020 23:35:27 +1100 (AEDT) Received: from localhost ([::1]:54296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6ZQr-0004Qx-53 for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 07:35:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54063) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Z8i-0002LF-L5 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 07:16:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Z8e-00019d-TU for qemu-devel@nongnu.org; Tue, 25 Feb 2020 07:16:40 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:37557) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6Z8e-00017K-KV; Tue, 25 Feb 2020 07:16:36 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MWz4j-1ivO5B1Ckj-00XMhb; Tue, 25 Feb 2020 13:16:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 01/21] linux-user: introduce parameters to generate syscall_nr.h Date: Tue, 25 Feb 2020 13:15:33 +0100 Message-Id: <20200225121553.2191597-2-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200225121553.2191597-1-laurent@vivier.eu> References: <20200225121553.2191597-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:QSCc3TddwX3lly3KukqNvrBIJJMeoEt8mHTWB41vO9P0kwdnTaD Rvof5GsoqtLMH+SEyfnfiuvB34iTpsNM056PQS6yOO1HmhkMf8NQCkmmpCRxvoyavaov7Z8 7xWkdl7DzyxdhMgd3T3LbuNz+Bbjqu5XCk4VX2En8yo3phvFIXrNPg7WDbSI5Ggs2SuPJn0 cKy8QyvaOVZVzx3phcRtg== X-UI-Out-Filterresults: notjunk:1; V03:K0:40Go5ricSUU=:QUO7WR3fuGWny/tHWAbbLI GM6/ZXaemgvDoGi2NXfaMeuVfmE027ZRXlrZ+41FetwkKeNjGmpVkdUZPfB8D8HQB+xifB7GR G+JtIC1j+z+NHFaoZlSs4pFBnTJa3zOc+78WoUbErNLGWLPwvUF3qi9I9M3VrVJJtindxRYXR /kdv0Z9BDvK3TawWbWfG/7JYRcNG9IQ2tKr6RmDpAOK24rkb2JOBBukKZKu/AS9mLKBM9Bis0 J3WBDx9W+8YXVBX10AOtdKLhZ4TKtJiKlQPdixAhP+pmaZ+clXQIjFxhkDJGlLlR6hMh23cGk dKnecA1yQgmRYBjcgFXSsBzh4wzEL8FdoftDs+iP2TvpDzaJvdw3hk2bvLmjfPM22f3aPsFfT pqH6gpxifZNThhxfZGth0/EevEPRSfNTRjrITS99zZrRsY4B72BaEr4asxSX4XsXrB1mdnhRH W7acoQcrwvGLyn9Mrrx9Kj5upCpFuQeg+OzQfQGIBeQf5m9e+BUJsbLfTZk8H93N37ywOoKUA 6odt7bVL7VzVXQLuTb/pBhgegcLJMat+nZ/hPqw+lt1Hb8GZadFDyQIm+X84iTIfJHh584fUe KjMa+8qRBn/Qh0seHFUDi1j4VXz92Qt3ZcSezPlgOrns+mkhamC6bnF4XyfUaFIENqFcLQyqH sa1O68HZckuF5SpkHre+6dXzd7zJ4J/gqkDkoM3wpvvB5BBIC+DX6G1FHKDkyy3k0ozlZA0oS IqLnyY3rfhn91O5UlQ7gXsw9ljpnsFj4Vh+6gFiZVWKQzBEwCFWYP6ucDRpnVQ55//gRRWaTB zebYyvJDHo0voQkMbNiVghqxYbUrnT/AG/HMjVZsTmpEOgr+azT6wHNzrBCn9mey62WO+fD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 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: Riku Voipio , Cornelia Huck , Laurent Vivier , qemu-s390x@nongnu.org, Aleksandar Markovic , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 Reviewed-by: Richard Henderson --- 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 d57261e3ad0c..c94161ced84f 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" @@ -7849,6 +7860,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