From patchwork Tue Mar 10 10:33:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1252078 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 48cBLw6m9Vz9s3x for ; Tue, 10 Mar 2020 21:35:33 +1100 (AEDT) Received: from localhost ([::1]:57020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBcER-00047U-6T for incoming@patchwork.ozlabs.org; Tue, 10 Mar 2020 06:35:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40624) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBcDw-00045O-JV for qemu-devel@nongnu.org; Tue, 10 Mar 2020 06:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBcDu-0008KX-Np for qemu-devel@nongnu.org; Tue, 10 Mar 2020 06:34:56 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60261) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBcDo-0008Eh-O2; Tue, 10 Mar 2020 06:34:50 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MDQNq-1j18561zoU-00ATOl; Tue, 10 Mar 2020 11:34:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v4 01/21] linux-user: introduce parameters to generate syscall_nr.h Date: Tue, 10 Mar 2020 11:33:43 +0100 Message-Id: <20200310103403.3284090-2-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310103403.3284090-1-laurent@vivier.eu> References: <20200310103403.3284090-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1wgLWl5U+m4trAd3M3frNG218zT3M77mKIgGqPClpjyB7/c3CRF 22jqoBrucvuQeXKyikSZuxWEBAK02qWf7hu6HWyoxaf1e0LQARSCKRn7TinSElHlvZroMy6 q2DPtlnLsU0JlXFDDoqc50LEN9pokvoqYMqSmUrCeo+W9bZXhDfJ8yH+7Zl5M7BZDGYaZJm 6KyWWosWTZqnJQyeM1qFg== X-UI-Out-Filterresults: notjunk:1; V03:K0:eYUMUVlSGVk=:Y3+Mjp2zF9CtQtrbbVJ9Jx xn7SC0uh0grmswtH+DW0zquVpcqsdcSoqWzPv09SCWLB/2n1MLpFQd08BKuWALNVz2LllKUhY ikE5j3Mst0XIGXL5NbFWKLfCaVOUq7rnCnF+FFMSW85zeAM+sAVifpiQUUKy2ozg0NtXdGBCD XLZN09o0SKecAUiTgqSynfEcfJxv2kA2OApPqnOx96xnTVdAXZs8UdOJegwu0+5IgVC3ibOCM ZnOZsGse6jzkN8gs68W6BydVBogEeoyw127cHe8FC/duaaZY1uctK7NhnU44BuBEAIreXZxD1 g5bH/L9bRGUHwxgl5d1ChnK/QdwiBtkk+eR/tP2lTT0ZLys6/wkyFAeFY0G0AhJecbXf/Ri4G W6ErkXLXvWXPxnkVUOczYS783ByJo9QOFEpsoAe36rmTukG7lzP47gVW03Jj44j5JoZrVyNtH /2OF3w6sN8+QWIAKOUxAHj+cId5xYl7KHz556QCNTbWcI/9eT/S3nC0/ob2m4dAMxuQVyKxRW Q1gAj6X9yF36nCaNFRxhS0PIfwgHJ73o09aIaMctEE4j2eAcUrg6Hk6Eked4h4IluAmWZdyLZ IMmBtvwOJfidPVaSHvbtBijUkEqS/hAyU7OjABhoOJ9i4rL40Lkky0FFINIre+gUNremHa43i HpXEvPPFBZUklSbOXNK/MBiG8SALIE45jrYa0wsqXxJfBj0dHl8oCWHyESkXoj/K6w8E4K7NX FP3o3ImhvaMsUPMBLZuXhGViY+Zvhhhm4Tcx3cjm4yHjva9r0Z4LRwa20M7+cgsnTirTj8PTS YbYdzPrgbPcHSa81Hum4ldrsrXOSPGxXXGtJsFgPHSKJUcFE2ehuK89BZhQF2U82I1RhtNu X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 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 , Richard Henderson , Taylor Simpson , 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 Reviewed-by: Taylor Simpson --- Makefile.target | 3 ++- configure | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile.target b/Makefile.target index 2d43dc586a10..cb3a6fa5e704 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 cbf864bff1be..39e55a1ecf06 100755 --- a/configure +++ b/configure @@ -1887,6 +1887,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" @@ -7931,6 +7942,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