From patchwork Wed Jul 31 15:08:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 94879 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F0E53858410 for ; Wed, 31 Jul 2024 15:10:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id AF4D93858C35 for ; Wed, 31 Jul 2024 15:09:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF4D93858C35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AF4D93858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722438572; cv=none; b=fWcQhSZH2uDvjIY28OKIo9ONA53NXm4Yq5x9lCUoqBjChEf8ImJIe+uwMiATKcVqmSRdW0Bd5K9523m7d8zyeq7OLqGdyC2Ew0GUCqjXUz2Z93+ux7iiJXXjiINIJzvYlmC/Xh8iegRgXIngUUOe2zX6L/VAx9VWqVNPnuuLh/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722438572; c=relaxed/simple; bh=0pSlHMxe3ITElq0kaNNE9cIaSlCxuomuiUT/d5kEzt0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=wkfwmC6tGzLwj040xRz50S8RMC3H+QXfNnikyeYJgiA94cEibKZ7AGtnj4gf3MJPj02rWzqitotAvkoii5iK1glBOuYHmUH4Z/qrCRXSy0AFp4YEtyXTLH95oJKMHUJ+t+hASoXzgzcFepRpt9iug1CNSruhJ89yfdpjZNfwYL4= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gcc-patches@gcc.gnu.org Cc: Sam James Subject: [COMMITTED PATCH 4/5] testsuite: fix dg-require-effective-target order vs dg-additional-sources Date: Wed, 31 Jul 2024 16:08:29 +0100 Message-ID: <25d477bdff752db29f9525e19e2ca6c7eb629121.1722438509.git.sam@gentoo.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP 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~patchwork=sourceware.org@gcc.gnu.org Per gccint, 'dg-require-effective-target' must come before any 'dg-additional-sources' directives. Fix a handful of deviant cases. gcc/testsuite/ChangeLog: * gcc.target/aarch64/aapcs64/func-ret-3.c: Fix dg-require-effective-target directive order. * gcc.target/aarch64/aapcs64/func-ret-4.c: Likewise. * gfortran.dg/PR100914.f90: Likewise. libgomp/ChangeLog: * testsuite/libgomp.c++/pr24455.C: Fix dg-require-effective-target directive order. * testsuite/libgomp.c/pr24455.c: Likewise. --- Committed as obvious. gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-3.c | 2 +- gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-4.c | 2 +- gcc/testsuite/gfortran.dg/PR100914.f90 | 2 +- libgomp/testsuite/libgomp.c++/pr24455.C | 2 +- libgomp/testsuite/libgomp.c/pr24455.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-3.c b/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-3.c index 1d35ebf14b4b..ebd2e8dd8791 100644 --- a/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-3.c +++ b/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-3.c @@ -4,9 +4,9 @@ in AAPCS64 \S 4.3.5. */ /* { dg-do run { target aarch64-*-* } } */ +/* { dg-require-effective-target aarch64_big_endian } */ /* { dg-additional-options "-mbranch-protection=none" } */ /* { dg-additional-sources "abitest.S" } */ -/* { dg-require-effective-target aarch64_big_endian } */ #ifndef IN_FRAMEWORK #define TESTFILE "func-ret-3.c" diff --git a/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-4.c b/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-4.c index 15e1408c62d7..03d42f3dd047 100644 --- a/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-4.c +++ b/gcc/testsuite/gcc.target/aarch64/aapcs64/func-ret-4.c @@ -5,9 +5,9 @@ are treated as general composite types. */ /* { dg-do run { target aarch64*-*-* } } */ +/* { dg-require-effective-target aarch64_big_endian } */ /* { dg-additional-options "-mbranch-protection=none" } */ /* { dg-additional-sources "abitest.S" } */ -/* { dg-require-effective-target aarch64_big_endian } */ #ifndef IN_FRAMEWORK #define TESTFILE "func-ret-4.c" diff --git a/gcc/testsuite/gfortran.dg/PR100914.f90 b/gcc/testsuite/gfortran.dg/PR100914.f90 index 8588157e59c0..161f1265fa21 100644 --- a/gcc/testsuite/gfortran.dg/PR100914.f90 +++ b/gcc/testsuite/gfortran.dg/PR100914.f90 @@ -1,7 +1,7 @@ ! Fails on x86 targets where sizeof(long double) == 16. ! { dg-do run } -! { dg-additional-sources PR100914.c } ! { dg-require-effective-target fortran_real_c_float128 } +! { dg-additional-sources PR100914.c } ! { dg-additional-options "-Wno-pedantic" } ! ! Test the fix for PR100914 diff --git a/libgomp/testsuite/libgomp.c++/pr24455.C b/libgomp/testsuite/libgomp.c++/pr24455.C index 8256b6693c8f..9816d37461a5 100644 --- a/libgomp/testsuite/libgomp.c++/pr24455.C +++ b/libgomp/testsuite/libgomp.c++/pr24455.C @@ -1,6 +1,6 @@ // { dg-do run } -// { dg-additional-sources pr24455-1.C } // { dg-require-effective-target tls_runtime } +// { dg-additional-sources pr24455-1.C } // { dg-options "-fno-extern-tls-init" } extern "C" void abort (void); diff --git a/libgomp/testsuite/libgomp.c/pr24455.c b/libgomp/testsuite/libgomp.c/pr24455.c index 8af449e7b5c3..4284c1095293 100644 --- a/libgomp/testsuite/libgomp.c/pr24455.c +++ b/libgomp/testsuite/libgomp.c/pr24455.c @@ -1,6 +1,6 @@ /* { dg-do run } */ -/* { dg-additional-sources pr24455-1.c } */ /* { dg-require-effective-target tls_runtime } */ +/* { dg-additional-sources pr24455-1.c } */ extern void abort (void);