From patchwork Fri Dec 2 09:25:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 61349 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 73F5B3858C62 for ; Fri, 2 Dec 2022 09:26:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 73F5B3858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669973169; bh=fV/z+Rqk2g5BaNsmgDQrjLqKF08SHHWBL2u6wgQ0cS4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=kSrKrTrclWoz/ZkSoBUmV/q/8s4aZeBgPExhaeIsmB3r6knAAT2BhVwH4RfH1FJCh wiRczMzCDCb+B8KeyXMDt5mRnnEgbTjxiqQUW5fR4NnbuzYWhg0fZIPAzxYsrBUjRl OBG4GZ+Bj/bKCh0ltODr+ggocwPWgtf1JdxeMbBQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id E12313858C53 for ; Fri, 2 Dec 2022 09:25:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E12313858C53 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id B25C7116B1E; Fri, 2 Dec 2022 04:25:36 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id hWJ6Q1uUYfHR; Fri, 2 Dec 2022 04:25:36 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 7A120116B1A; Fri, 2 Dec 2022 04:25:36 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 2B29PUbg1291232 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 06:25:30 -0300 To: gcc-patches@gcc.gnu.org Cc: Rainer Orth , Mike Stump Subject: [PATCH] [testsuite] [arm/aarch64] -fno-short-enums for auto-init-[12].c Organization: Free thinker, does not speak for AdaCore Date: Fri, 02 Dec 2022 06:25:30 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" On arm-eabi, and possibly on other platforms, -fshort-enums is enabled by default, which breaks some tests' expectations as to enum sizes with DEFERRED_INIT. Disable short enums so that the expectations are met. Regstraped on x86_64-linux-gnu, also tested with crosses to riscv64-elf and arm-eabi. Ok to install? for gcc/testsuite/ChangeLog * c-c++-common/auto-init-1.c: Add -fno-short-enums. * c-c++-common/auto-init-2.c: Likewise. * gcc.dg/debug/btf/btf-enum-1.c: Likewise. --- gcc/testsuite/c-c++-common/auto-init-1.c | 2 +- gcc/testsuite/c-c++-common/auto-init-2.c | 2 +- gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/c-c++-common/auto-init-1.c b/gcc/testsuite/c-c++-common/auto-init-1.c index df04358728bab..3e6a4984eea22 100644 --- a/gcc/testsuite/c-c++-common/auto-init-1.c +++ b/gcc/testsuite/c-c++-common/auto-init-1.c @@ -1,6 +1,6 @@ /* Verify zero initialization for integer and pointer type automatic variables. */ /* { dg-do compile { target { ilp32 || lp64 } } } */ -/* { dg-options "-ftrivial-auto-var-init=zero -fdump-tree-gimple" } */ +/* { dg-options "-ftrivial-auto-var-init=zero -fno-short-enums -fdump-tree-gimple" } */ #ifndef __cplusplus # define bool _Bool diff --git a/gcc/testsuite/c-c++-common/auto-init-2.c b/gcc/testsuite/c-c++-common/auto-init-2.c index 6ac63bb1ddac1..d356e508b836f 100644 --- a/gcc/testsuite/c-c++-common/auto-init-2.c +++ b/gcc/testsuite/c-c++-common/auto-init-2.c @@ -1,6 +1,6 @@ /* Verify pattern initialization for integer and pointer type automatic variables. */ /* { dg-do compile { target { ilp32 || lp64 } } } */ -/* { dg-options "-ftrivial-auto-var-init=pattern -fdump-tree-gimple" } */ +/* { dg-options "-ftrivial-auto-var-init=pattern -fno-short-enums -fdump-tree-gimple" } */ #ifndef __cplusplus # define bool _Bool diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c index 7e940529f1b6d..2887cb1c5f244 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c @@ -1,7 +1,7 @@ /* Test BTF generation for enums. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gbtf -dA" } */ +/* { dg-options "-O0 -gbtf -fno-short-enums -dA" } */ /* { dg-final { scan-assembler-times "\[\t \]0x6000004\[\t \]+\[^\n\]*btt_info" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0x86000003\[\t \]+\[^\n\]*btt_info" 1 } } */