From patchwork Tue Jul 14 09:52:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 235520 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3583804ilg; Tue, 14 Jul 2020 02:55:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzllByvXwB4053fOTlEwpxWdvzkuryIK/lzOio1fwuSsxW+QWhIugw7JVChOjJUVc7u8m07 X-Received: by 2002:a5b:1c4:: with SMTP id f4mr7092017ybp.472.1594720524306; Tue, 14 Jul 2020 02:55:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594720524; cv=none; d=google.com; s=arc-20160816; b=G9Ik2OeMjlmzgKNuLLS8lGKo0VJdyUNYahIhQw4qs4M2ke4B0FVCopjquuJXc2XRCl ssVpuxHjjBDg+VEVotB1aaOXbVc49MtozE9RiZQta0dZKddSqLx/+Lzeju/KD99xfZeC /9zxWChqZuMKMrVME1UJOx48YUb9HK8qDecFR/jdmHmvp4d7ngwZTkx2PMKsX5143AFd j4hcop++kT5TNicM3ucJeAhdKOgr6Q6CTS1YQAoEI/EuW7GR2nn5BSaVtg3O4tcDoklC Zq9m/edMZ9jqj1GsNlss3ClD12FmVHrlKZZkq4lhBhrvMsZrSHLrA/2bwtY2T5tLgiCA 0m8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=i/rZS2K2Az8C+lisjWwqZtaVxOPrNRDFcL8rDoPQEgQ=; b=urHZcfTJX+LqxeA6mCoIldT64ytYfW4cLiO3A58CRoPNXwVV4Q1yI99fPjvXWT9o00 /ckFcRkfQUUvz5oJKaNN67GyPn+JgiS/P/yX0GeMluKyDJeu2iCnUlZZdBHndF+5VHJh K8V8lOt6fio+joo95MTMGUkIP9UfcGOxddPIzKjI5ePfeXfz1E6+tzflYsV3lUf7JTBZ 1yB4WPYv6uxTW+UHEi4JYxiJPlO9M0roELa4vipjnXsswnvcIlw67taIDGbgp6kw7PvK cmp6W+PlQaFAPP0v3AZsj9XtaL4NFFo+AqBs5FOJUjfaY9eJXQ2uri6zcTQcq8iHglM8 GWLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXINzGG3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 184si11753573ybi.420.2020.07.14.02.55.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Jul 2020 02:55:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXINzGG3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvHel-0006iE-OC for patch@linaro.org; Tue, 14 Jul 2020 05:55:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvHcN-0003Lk-8S for qemu-devel@nongnu.org; Tue, 14 Jul 2020 05:52:55 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvHcL-0003wi-GL for qemu-devel@nongnu.org; Tue, 14 Jul 2020 05:52:54 -0400 Received: by mail-wm1-x344.google.com with SMTP id j18so4145143wmi.3 for ; Tue, 14 Jul 2020 02:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i/rZS2K2Az8C+lisjWwqZtaVxOPrNRDFcL8rDoPQEgQ=; b=dXINzGG3ag6LKDbkW4BjtgVmcpQ9NraO57pT0C9QAZziDLD7emdkHuf6Q2abfhtT5x yEj33N7okEGgOpXvmTmq+HkmVrQPFolV3RI/2k3nSV6KPXRAXO1z5k48LX1FeTTjGzyA vtpfG18DcyO90lrbMMAGTtoCKJXhcnFGditbhycA1oJzkm9eJx+enxRK0n7Lz+4+blDf Sfx0ZCiO1MJx9dXLqHxGc0bVER5k33M/MbXDMVIvv8kmWb0gs6sAJ+5QLwoWB/6R3twU dN5m+kkhaY6l9rokKo5JeaK0p6d0tFvrKRCDyMDvQRzaV2AxcRryr1cpjZm/nZk10tpk DtiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i/rZS2K2Az8C+lisjWwqZtaVxOPrNRDFcL8rDoPQEgQ=; b=W16Q3MHGq6YqARQkKyH66HAyRHNqqzhLhOgbW09+6wIWnkqvnawppWD9xCizbQXlV/ Sb3NllX80yNktr/egV+RObejYTMJ8qyZlKADIdBhDb/rklNad030Bz+b7iMeobk1ytJ2 Cb0eiGdcQdVq7gpobVreLrDRrZXz7cOXEAmXhS281M8pt6KOr7zrA+sqNC0nz+KEcvsy A3/gWEpnlJbnmsYyBWGoJe3Dm/eEoYl+NPIM1F9iPg1iUPMRiDQP12x48z08yjSu0QN7 OxxCmQzkNhFOjHCY2WYYLLXIJXtZF9k39SQaPGxwCJLhARknKjBh+G+s+FZc4gMhC72t i6+w== X-Gm-Message-State: AOAM530IKbVzG7gecn54iuLRGHNvybIaUDP3XKER7j8i57ed8wFNUAAC 2+zI/LSYuIIcvXL8K9uj55zoZA== X-Received: by 2002:a05:600c:2116:: with SMTP id u22mr3406458wml.82.1594720371966; Tue, 14 Jul 2020 02:52:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u8sm28169159wrt.28.2020.07.14.02.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 02:52:48 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7890E1FF8C; Tue, 14 Jul 2020 10:52:47 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/9] configure: remove all dependencies on a (re)configure Date: Tue, 14 Jul 2020 10:52:40 +0100 Message-Id: <20200714095247.19573-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200714095247.19573-1-alex.bennee@linaro.org> References: <20200714095247.19573-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The previous code was brittle and missed cases such as the mipn32 variants which for some reason has the 64 bit syscalls. This leads to a number of binary targets having deps lines like: all.clang-sanitizer/mipsn32el-linux-user/linux-user/signal.d 140: /home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h \ 455:/home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h: all.clang-sanitizer/mipsn32el-linux-user/linux-user/syscall.d 146: /home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h \ 485:/home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h: which in turn would trigger the re-generation of syscall_nr.h in the source tree (thanks to generic %/syscall_nr.h rules). The previous code attempts to clean it out but misses edge cases but fails. After spending a day trying to understand how this was happening I'm unconvinced that there are not other such breakages possible with this "caching". As we add more auto-generated code to the build it is likely to trip up again. Apply a hammer to the problem. Fixes: 91e5998f18 (which fixes 5f29856b852d and 4d6a835dea47) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200713200415.26214-2-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index bc3b9ad931..e1de2f5b24 100755 --- a/configure +++ b/configure @@ -1955,23 +1955,20 @@ EOF exit 0 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 alpha hppa m68k xtensa sh4 microblaze arm ppc s390x sparc sparc64 \ i386 x86_64 mips mips64 ; 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 - for target in ${arch}*-linux-user ; do - test -d "${target}" && find "${target}" -type f -name "*.d" \ - -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {} \; \ - -print | while read file ; do rm "${file}" "${file%.d}.o" ; done - done done +# Clean out all old dependency files. As more files are generated we +# run the risk of old dependencies triggering generation in the wrong +# places. Previous brittle attempts to be surgical tend to miss edge +# cases leading to wasted time and much confusion. +find -type f -name "*.d" -exec rm -f {} \; + if test -z "$python" then error_exit "Python not found. Use --python=/path/to/python"