From patchwork Fri Jun 7 04:47:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1944899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=I1fA5HgO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwTGT5bwhz20KL for ; Fri, 7 Jun 2024 14:48:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AF09339B2EDA for ; Fri, 7 Jun 2024 04:47:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 22C3139AB920 for ; Fri, 7 Jun 2024 04:47:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22C3139AB920 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 22C3139AB920 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::634 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717735663; cv=none; b=RA8gXSNinTBhEuCLd4U6hTQMWbDaX8wqyNPn5izvDzqP2OLtWjrV1lffbb88RxV3StwVTX8gZ5ZRdwpZENb9DmeTKkNlOktw9zi9lrUKnOJgdyG8YULBcYd7kXPppzeT+sxzmqCIZ3fvgTLkUnfyz+Q4bh1jj9O5MPIh7EMS5qU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717735663; c=relaxed/simple; bh=WjTCKWsTLPlF12P8Pys81Fmiq9W1H3FxyfiV+3xvsnA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=NL/MKQOmcODhO5Xls1Vldoctzj0xp7mlS0smj4VRO7T55OMbXt1fwohHCwJCMf7z2SUGtxHJmhejQicDvz0VfWRCB8rLqrEra3o+iu9yu30GFkZ3h0l5Rr98eBiTBDRQLAfcTdR5cu0FfmkBhbgs3jYrUej+akkI1Gqc+TKdUSU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1f65a3abd01so16172935ad.3 for ; Thu, 06 Jun 2024 21:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1717735661; x=1718340461; darn=gcc.gnu.org; h=mime-version:user-agent:message-id:date:organization:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=mS/uRfezorjYUU22ruKKQBMXez6ad4p5RlH4tNk6neg=; b=I1fA5HgOqiR1pFMP+S57NAzJ5pQY8Phec/w2xT5yhWtWWknag3k2Ctv/dwPbqLOnaR MylRFy5Pv19DI6vOfFPX45q/k0/xLFcm/N7pqH78NVB6ovc+5VtaFMMEiF1fB5SFdmyc 9WW2XOfU/4YNLcwebbBzN2CJgsxkZq6wzhOI0U2IXR/7UTx6Ry/HEPG6q9gknSzglGFi F9f+CW7zSHGJ5L7G9AR+/67XVrkEI6T8++nwUGjcHAb2wjaV85/M9oP9/fSg0Z+kRwhJ a0DF1MO0vlco4DVE/WPug7Mo9KXNbtV1l3GfTng4pSFnMUhZUXbX3qVTQUSasurma9Jv RDFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717735661; x=1718340461; h=mime-version:user-agent:message-id:date:organization:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mS/uRfezorjYUU22ruKKQBMXez6ad4p5RlH4tNk6neg=; b=OXP4SSKCLVXVdSV7rHlrpPFcuQ/RoPlHHpdKEqdPAc0vcwsjjSNIj7GjlDBdGzyvb+ L8g6EfsEYG1tUBaqkq3Qx1JrbzwWw+uBLbOJ5+4LWhwqmp1SujWQb2Ad2yhL8mOp2cLE 5ttfO2biWwXYryrZDx5Ij6gQthUheWpqfGZwhvRqFwlTlLpLUCMloWHqYRZhPJroU6/L xgct/6pvafnxoqRT/Mqko+gshIet1JnVRMV5kF1xxhGv/2taetEBvZsl6PlOlwskZmpG MMwxvSgPWkgadc1E9fgfVYelnMl7LJtBw+1TE71yrnOHvP3Rcxe6Tzs0jCFFbjFETU+a O/oA== X-Gm-Message-State: AOJu0YxhrlhrXQQtGdgxYJF5IPeRBifUwQftfFRr7hGVbGyRLJ0u5wFV mleMrVze9afqbH9j6tV1x0pBs4c9q1CGv5per0fig10i+9S1zHVqk3VOEE95LJOaYyTSsqIcBBu cunAT X-Google-Smtp-Source: AGHT+IGTqipZ1aPkbuDlM0kcSocDIv7UgIAgykrwdnEhPzghr22uqa1gxnG1uG1rWdkRTh9ufEL8Sw== X-Received: by 2002:a17:902:eb86:b0:1f4:8bb7:6862 with SMTP id d9443c01a7336-1f6d02bec1bmr20665875ad.5.1717735660755; Thu, 06 Jun 2024 21:47:40 -0700 (PDT) Received: from free.home ([2804:7f1:218b:1961:ef8:d680:5399:8b1a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f6bd76cc90sm24364125ad.84.2024.06.06.21.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 21:47:40 -0700 (PDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 4574lPY6909016 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 7 Jun 2024 01:47:25 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: Rainer Orth , Mike Stump , Nick Clifton , Richard Earnshaw , Ramana Radhakrishnan Subject: [PATCH] [testsuite] [arm] test board cflags in multilib.exp Organization: Free thinker, does not speak for AdaCore Date: Fri, 07 Jun 2024 01:47:25 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org multilib.exp tests for multilib-altering flags in a board's multilib_flags and skips the test, but if such flags appear in the board's cflags, with the same distorting effects on tested multilibs, we fail to skip the test. Extend the skipping logic to board's cflags as well. Regstrapping on x86_64-linux-gnu. Already tested on arm-eabi (gcc-13 and trunk). Ok to install? for gcc/testsuite/ChangeLog * gcc.target/arm/multilib.exp: Skip based on board cflags too. --- gcc/testsuite/gcc.target/arm/multilib.exp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/gcc.target/arm/multilib.exp b/gcc/testsuite/gcc.target/arm/multilib.exp index 4442d5d754bd6..12c93bc89d222 100644 --- a/gcc/testsuite/gcc.target/arm/multilib.exp +++ b/gcc/testsuite/gcc.target/arm/multilib.exp @@ -18,13 +18,15 @@ load_lib gcc-dg.exp dg-init -if { [board_info [target_info name] exists multilib_flags] - && [regexp {(-marm|-mthumb|-march=.*|-mcpu=.*|-mfpu=.*|-mfloat=abi=.*)\y} [board_info [target_info name] multilib_flags]] } { +foreach flagsvar {multilib_flags cflags} { + if { [board_info [target_info name] exists $flagsvar] + && [regexp {(-marm|-mthumb|-march=.*|-mcpu=.*|-mfpu=.*|-mfloat=abi=.*)\y} [board_info [target_info name] $flagsvar]] } { # Multilib flags override anything we can apply to a test, so # skip if any of the above options are set there. - verbose "skipping multilib tests due to multilib_flags setting" 1 + verbose "skipping multilib tests due to $flagsvar setting" 1 return + } } # We don't want to run this test multiple times in a parallel make check.