From patchwork Sun Jan 7 12:14:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 185725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp509243dyq; Sun, 7 Jan 2024 04:14:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEtP6quJcKy7BdCl3FQJlPaalduHa1U+5gyeD6LV/W+QAF+knA2YnXqx+HTxRneJd2t8ZCu X-Received: by 2002:a37:ad09:0:b0:783:1f65:cbb1 with SMTP id f9-20020a37ad09000000b007831f65cbb1mr477340qkm.31.1704629699265; Sun, 07 Jan 2024 04:14:59 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1704629699; cv=pass; d=google.com; s=arc-20160816; b=ueFooXp1GqO2Vh9tsIEa80HWHntkk3YChamSBGSp0uHtm0TZEavt/rLiFTyLNfryQh HMe7UJeP4QzzH73IEseMBrPMZ4MFO/2WwMBIRBaDTuPWZsqcXR2s2nXSwBrzFE3rTSUK tw96s/UImCbU0CB/aIHnEVtv1TM4/bI2K6aTyHth5Ba2dYXoRTV1De3t3OXP+21SxuJ7 q3qQ/iK4/HUL9lpOeV84gPgbv/gH4a6g2G1dEPGr4vkyMaKwbUrvBlPsKSheWnF7KMs0 1ICdaYB5cmQrIclqY4E3cI/j+wat0D6cnlYtkIg5RBCi5tVhVd5ssnk+gPCgk7xgMSz6 DR9A== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :subject:from:to:content-language:user-agent:mime-version:date :message-id:dkim-signature:dkim-signature:arc-filter:dmarc-filter :delivered-to; bh=p8TYRSQnow0rLnJVbIcml8C//26phvErny4n2urJmJw=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=iLZ2FNIexrSH+xWXD2TULP1892+jp/NdNDz1r9erlnN5KCyuAYH5Utke2fDt5RdKc6 OUr6w92OTmGUtDt+ffUTYjuVHyFkJQ5MPuP5hXfqJRSAIwYngoHs95daMxJMLJ+20ayI izX2a1OmvCFFne7FCjQo8DHVjbCNjTDwZuJrsbynuRRyjTQlrl3D7im1t1bvgQsWptl6 zq1g4VlNq0j4HCJhFdE+SYQ6y3D1EvpAV3P2P616nvP/hImDGJdZ0ar2d/Uxa09DEMku DK70JJ6qjD5Kgj1Nz7rvtE5E934f0SsmAqhOC6n11TlrsIF1y/zSAWlU908bkPcoR+// MLrw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@gjlay.de header.s=strato-dkim-0002 header.b=l1RRTSbc; dkim=neutral (no key) header.i=@gjlay.de header.s=strato-dkim-0003; arc=pass (i=2); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p20-20020a05620a113400b0077d685d25b6si5462092qkk.252.2024.01.07.04.14.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 04:14:59 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gjlay.de header.s=strato-dkim-0002 header.b=l1RRTSbc; dkim=neutral (no key) header.i=@gjlay.de header.s=strato-dkim-0003; arc=pass (i=2); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F09C4385841E for ; Sun, 7 Jan 2024 12:14:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.219]) by sourceware.org (Postfix) with ESMTPS id 44EAF3858D35 for ; Sun, 7 Jan 2024 12:14:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 44EAF3858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 44EAF3858D35 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=81.169.146.219 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1704629661; cv=pass; b=jnejOIPx1aEk52jNa5jPfgqSmLMen/BKLSaZhHhRm23RWIOKtIcK6HJGEGbLx3nBYnnryJUKZCFC8h2XkdjAGoc0C8E7A9/zg2LNQYxJMbYp+qxf9aD7Mnb0d/TZCF7FJ/55iblaEBvrHjGnXuFUFuLxMlI03p8w9p4AOCnlAHM= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1704629661; c=relaxed/simple; bh=ApIIHawopy7Zj2gPCx3+M05fqAUmB8BPISCL36Md84U=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version:To: From:Subject; b=PfxaRs38P263ZsBvr2kTaTX32owSw2b59T25mnUyE65nGMbw6Us1iqPCvUqw7J/AdZQM+z3YX4q3L+PiNf+qEs/kdZf7jdBC9MLDSYLSlk9USB3PLDNFlDZb0/u39YVbTIkpL6fbu+Dtx/x800FoIq0EhMA0YwhJJAvx2rL1llU= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1704629658; cv=none; d=strato.com; s=strato-dkim-0002; b=bFGfMe6ovJdtiXCJjj0sFdBdakozJEn+8H/1CeXLqLZuzjzubUq5axnxjIwbHH6ZzT TpiGwpTjat4wf/Vcr3V7ayGXCtx2v7CWroXCnt7/WQTcIASD97riAW3F8SSlr8Ex4eJA ooyNF5+pHAJS9WHTrbSwCfUSQbkNl7SzVcl/8SM586xMzrl0NKfuaSGe+9NR05CBdv0N LiFBkBXvC/ermmg4Vif9yiE0kd2xPgUCWooRb/AYV6643uCLLvVAVP19km9YVfBRPIzG xAb/9zkgqhAEvEG5LXVcyhlp0eEQTi72QOodW0TNXHVYOL/5eJ7iN7t+6tFu9nkvdb5D Vhhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1704629658; s=strato-dkim-0002; d=strato.com; h=Subject:From:To:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=p8TYRSQnow0rLnJVbIcml8C//26phvErny4n2urJmJw=; b=C7E2sMvYHc8SmlsUQhw+KwvbE7HXu6B/bcaGndimv1erRRGsntbnlbCX4qd6E0rttj DHGyyhcD6xDM7HT62N0c9UKGPYpZ7X1aznoTV+eIdczz1JhBvSmcXC1osahgq6SuFA1V BNiae07eX6QRTmHAyi5XvumjtSU2jx3h1MW9b6JxoYroN9r/kyiWlnRuauGpCep624uT vH1J7Cv4AlRtM9HRDWGNgLfuAHe+0iBLq2kERgHlSb9bQXcrUg/gqMhTc0ywCu47rVct uGNQ+AzYMsmQcsU7a0rLLHgMnURMVYnXO2wEFsgJiAZB7xq6yLb3boh1KKFtUUShtbiX A/mA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1704629658; s=strato-dkim-0002; d=gjlay.de; h=Subject:From:To:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=p8TYRSQnow0rLnJVbIcml8C//26phvErny4n2urJmJw=; b=l1RRTSbct8FEK1TvNQt8Cjs5HK/8fwqHVnnKqz+WlfxJOf/5iljtmUSrKcK6JWjLuk 0XBUlP2KU2D3xFDqruKb5IAk3YzYGFRc01OiNLlUohn01JJrE+c4IWgHz/kR/+pTq4SO R0aOsaT3ByZuypl00MR8xgzvpbb56IioK27VWfHMNFhVnBG4nXsP1kmEEUoadSbxkZZM 64hdpDfow8G4vhsg7Kwl7dXnRVWuswhbrS4EXVDpWH8VbztrZvH5ytPTT8SuF1yOrQ7b TTRJEO05nfviRyO0Q6/nUy4SFtSMwRQk6M8Js47f+ZcaC2mwDgwL8CY7NBDzZBeFE8Ls L1lA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1704629657; s=strato-dkim-0003; d=gjlay.de; h=Subject:From:To:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=p8TYRSQnow0rLnJVbIcml8C//26phvErny4n2urJmJw=; b=bDCWeC4vC08aZvisqJ0pwk6sTRuNp41H1hK7uurWqB+fZQOwJTAiS7+2p21rPXqKOu wWQvnk+ckqrA0LkkK9BQ== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKT7Qq0xotTetVnKkSjsSjq3WhKPVxx3mY" Received: from [192.168.2.102] by smtp.strato.de (RZmta 49.10.2 DYNA|AUTH) with ESMTPSA id 641e88007CEHJXy (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Sun, 7 Jan 2024 13:14:17 +0100 (CET) Message-ID: Date: Sun, 7 Jan 2024 13:14:10 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches@gcc.gnu.org From: Georg-Johann Lay Subject: [patch,testsuite,applied] PR52641: Fix more fallout from sloppy tests. X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787433791737151935 X-GMAIL-MSGID: 1787433791737151935 This patch rectifies more tests that make assumptions on sizeof(int), sizeof(void*), etc. Johann --- testsuite/52641: Fix fallout from sloppy tests. gcc/testsuite/ PR testsuite/52641 * gcc.dg/memchr-3.c [avr]: Anticipate -Wbuiltin-declaration-mismatch. * gcc.dg/pr103207.c: Use __INT32_TYPE__ instead of int. * gcc.dg/pr103451.c [void* != long]: Anticipate -Wpointer-to-int-cast. * gcc.dg/pr110496.c [void* != long]: Anticipate -Wint-to-pointer-cast. * gcc.dg/pr109977.c: Use __SIZEOF_DOUBLE__ instead of 8. * gcc.dg/pr110506-2.c: Use __UINT32_TYPE__ for uint32_t. * gcc.dg/pr110582.c: Require int32plus. * gcc.dg/pr111039.c: [sizeof(int) < 4]: Use __INT32_TYPE__. * gcc.dg/pr111599.c: Same. * gcc.dg/builtin-dynamic-object-size-0.c: Require size20plus. * gcc.dg/builtin-object-size-1.c [avr]: Skip tests with strndup. * gcc.dg/builtin-object-size-2.c: Same. * gcc.dg/builtin-object-size-3.c: Same. * gcc.dg/builtin-object-size-4.c: Same. * gcc.dg/pr111070.c: Use __UINTPTR_TYPE__ instead of unsigned long. * gcc.dg/debug/btf/btf-pr106773.c: Same. * gcc.dg/debug/btf/btf-bitfields-2.c: [sizeof(int) < 4]: Use __UINT32_TYPE__. diff --git a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c index 07e3da6f254..c3ac6230d4d 100644 --- a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c +++ b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c @@ -1,5 +1,6 @@ /* { dg-do run } */ /* { dg-options "-O2" } */ +/* { dg-require-effective-target size20plus } */ #include "builtin-object-size-common.h" diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-1.c b/gcc/testsuite/gcc.dg/builtin-object-size-1.c index db325801f93..64c4bc4da39 100644 --- a/gcc/testsuite/gcc.dg/builtin-object-size-1.c +++ b/gcc/testsuite/gcc.dg/builtin-object-size-1.c @@ -621,6 +621,7 @@ test10 (void) } } +#ifndef __AVR__ /* avr has no strndup */ /* Tests for strdup/strndup. */ size_t __attribute__ ((noinline)) @@ -708,6 +709,7 @@ test11 (void) FAIL (); free (res); } +#endif /* avr */ int main (void) @@ -724,6 +726,8 @@ main (void) test8 (); test9 (1); test10 (); +#ifndef __AVR__ /* avr has no strndup */ test11 (); +#endif DONE (); } diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-2.c b/gcc/testsuite/gcc.dg/builtin-object-size-2.c index 4c71b1f6a37..da10b6b0632 100644 --- a/gcc/testsuite/gcc.dg/builtin-object-size-2.c +++ b/gcc/testsuite/gcc.dg/builtin-object-size-2.c @@ -536,6 +536,7 @@ test8 (unsigned cond) #endif } +#ifndef __AVR__ /* avr has no strndup */ /* Tests for strdup/strndup. */ size_t __attribute__ ((noinline)) @@ -623,6 +624,7 @@ test9 (void) FAIL (); free (res); } +#endif /* avr */ int main (void) @@ -637,6 +639,8 @@ main (void) test6 (); test7 (); test8 (1); +#ifndef __AVR__ /* avr has no strndup */ test9 (); +#endif DONE (); } diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-3.c b/gcc/testsuite/gcc.dg/builtin-object-size-3.c index 3d907ef4814..f23873bec38 100644 --- a/gcc/testsuite/gcc.dg/builtin-object-size-3.c +++ b/gcc/testsuite/gcc.dg/builtin-object-size-3.c @@ -628,6 +628,7 @@ test10 (void) } } +#ifndef __AVR__ /* avr has no strndup */ /* Tests for strdup/strndup. */ size_t __attribute__ ((noinline)) @@ -716,6 +717,7 @@ test11 (void) FAIL (); free (res); } +#endif /* avr */ int main (void) @@ -732,6 +734,8 @@ main (void) test8 (); test9 (1); test10 (); +#ifndef __AVR__ /* avr has no strndup */ test11 (); +#endif DONE (); } diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-4.c b/gcc/testsuite/gcc.dg/builtin-object-size-4.c index c9af07499a4..dcb042f34b6 100644 --- a/gcc/testsuite/gcc.dg/builtin-object-size-4.c +++ b/gcc/testsuite/gcc.dg/builtin-object-size-4.c @@ -509,6 +509,7 @@ test8 (unsigned cond) #endif } +#ifndef __AVR__ /* avr has no strndup */ /* Tests for strdup/strndup. */ size_t __attribute__ ((noinline)) @@ -596,6 +597,7 @@ test9 (void) FAIL (); free (res); } +#endif /* avr */ int main (void) @@ -610,6 +612,8 @@ main (void) test6 (); test7 (); test8 (1); +#ifndef __AVR__ /* avr has no strndup */ test9 (); +#endif DONE (); } diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c index 03c323a6d49..2ec00dc6796 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c @@ -18,6 +18,10 @@ /* Only 2 members. */ /* { dg-final { scan-assembler-times "MEMBER" 2 } } */ +#if __SIZEOF_INT__ < 4 +#define unsigned __UINT32_TYPE__ +#endif + struct foo { unsigned a : 31; diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-pr106773.c b/gcc/testsuite/gcc.dg/debug/btf/btf-pr106773.c index f90fa773a4b..511a54f800d 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-pr106773.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-pr106773.c @@ -17,8 +17,8 @@ extern const void foo __attribute__((weak)) __attribute__((section (".ksyms"))); extern const void bar __attribute__((weak)) __attribute__((section (".ksyms"))); -unsigned long func () { - unsigned long x = (unsigned long) &foo; +__UINTPTR_TYPE__ long func () { + __UINTPTR_TYPE__ x = (__UINTPTR_TYPE__) &foo; return x; } diff --git a/gcc/testsuite/gcc.dg/memchr-3.c b/gcc/testsuite/gcc.dg/memchr-3.c index 9c73265a89e..9a357351950 100644 --- a/gcc/testsuite/gcc.dg/memchr-3.c +++ b/gcc/testsuite/gcc.dg/memchr-3.c @@ -6,7 +6,7 @@ typedef __INT8_TYPE__ int8_t; typedef __INT32_TYPE__ int32_t; -extern void* memchr (const void*, int, long); /* { dg-warning "-Wbuiltin-declaration-mismatch" "" { target llp64 } } */ +extern void* memchr (const void*, int, long); /* { dg-warning "-Wbuiltin-declaration-mismatch" "" { target { llp64 || avr-*-* } } } */ struct SX { diff --git a/gcc/testsuite/gcc.dg/pr103207.c b/gcc/testsuite/gcc.dg/pr103207.c index 69c0f555f86..b3043f471fb 100644 --- a/gcc/testsuite/gcc.dg/pr103207.c +++ b/gcc/testsuite/gcc.dg/pr103207.c @@ -1,7 +1,7 @@ // { dg-do compile } // { dg-options "-O2 --param case-values-threshold=1 -w" } -int f (int i) +int f (__INT32_TYPE__ i) { switch (i) { case 2147483647: diff --git a/gcc/testsuite/gcc.dg/pr103451.c b/gcc/testsuite/gcc.dg/pr103451.c index db724aa1233..6fa84b406b3 100644 --- a/gcc/testsuite/gcc.dg/pr103451.c +++ b/gcc/testsuite/gcc.dg/pr103451.c @@ -13,7 +13,7 @@ void func_10(long li_8) void func_9_s_8(void) { - func_10((long) func_9_s_8); + func_10((long) func_9_s_8); /* { dg-warning "-Wpointer-to-int-cast" "" { target { ! ptr_eq_long } } } */ } // { dg-final { scan-tree-dump " / 0" "optimized" } } diff --git a/gcc/testsuite/gcc.dg/pr109977.c b/gcc/testsuite/gcc.dg/pr109977.c index 03d9a333134..c0be161ef4e 100644 --- a/gcc/testsuite/gcc.dg/pr109977.c +++ b/gcc/testsuite/gcc.dg/pr109977.c @@ -2,8 +2,8 @@ /* { dg-do compile } */ /* { dg-options "-Og" } */ -typedef double __attribute__((__vector_size__ (8))) V; -typedef double __attribute__((__vector_size__ (16))) W; +typedef double __attribute__((__vector_size__ (__SIZEOF_DOUBLE__))) V; +typedef double __attribute__((__vector_size__ (__SIZEOF_DOUBLE__*2))) W; V v; int i; extern void bar (void *); diff --git a/gcc/testsuite/gcc.dg/pr110496.c b/gcc/testsuite/gcc.dg/pr110496.c index 3c3d12fb532..5a168fde3e1 100644 --- a/gcc/testsuite/gcc.dg/pr110496.c +++ b/gcc/testsuite/gcc.dg/pr110496.c @@ -7,7 +7,7 @@ int f_MV0__x; void f() { unsigned char *rptr; unsigned char valbuf[6]; - rptr = (unsigned char *)contents; + rptr = (unsigned char *)contents; /* { dg-warning "-Wint-to-pointer-cast" "" { target { ! ptr_eq_long } } } */ if (decide()) do { __builtin_memcpy(valbuf, &f_MV0__x, sizeof(int)); diff --git a/gcc/testsuite/gcc.dg/pr110506-2.c b/gcc/testsuite/gcc.dg/pr110506-2.c index aabca0fa156..4bc9089a206 100644 --- a/gcc/testsuite/gcc.dg/pr110506-2.c +++ b/gcc/testsuite/gcc.dg/pr110506-2.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2" } */ -typedef unsigned uint32_t; +typedef __UINT32_TYPE__ uint32_t; typedef uint32_t uint32x4 __attribute__((vector_size(16))); typedef struct { uint32x4 b, d; diff --git a/gcc/testsuite/gcc.dg/pr110582.c b/gcc/testsuite/gcc.dg/pr110582.c index ae0650d3ae7..6607cf5c895 100644 --- a/gcc/testsuite/gcc.dg/pr110582.c +++ b/gcc/testsuite/gcc.dg/pr110582.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fdump-tree-vrp2" } */ +/* { dg-require-effective-target int32plus } */ int a, b; int main() { diff --git a/gcc/testsuite/gcc.dg/pr111039.c b/gcc/testsuite/gcc.dg/pr111039.c index bec9983b35f..a64c46c7edc 100644 --- a/gcc/testsuite/gcc.dg/pr111039.c +++ b/gcc/testsuite/gcc.dg/pr111039.c @@ -1,6 +1,10 @@ /* { dg-do compile } */ /* { dg-options "-O" } */ +#if __SIZEOF_INT__ < 4 +#define int __INT32_TYPE__ +#endif + int _setjmp (); void abcd (); void abcde (); diff --git a/gcc/testsuite/gcc.dg/pr111070.c b/gcc/testsuite/gcc.dg/pr111070.c index 1ebc7adf782..1de3a3680fe 100644 --- a/gcc/testsuite/gcc.dg/pr111070.c +++ b/gcc/testsuite/gcc.dg/pr111070.c @@ -12,9 +12,9 @@ char d_ary[1] = {1}; int main () { - if (((unsigned long)&c_ary[0] & 7) != 0) + if (((__UINTPTR_TYPE__)&c_ary[0] & 7) != 0) return 1; - if (((unsigned long)&d_ary[0] & 7) != 0) + if (((__UINTPTR_TYPE__)&d_ary[0] & 7) != 0) return 1; return 0; } diff --git a/gcc/testsuite/gcc.dg/pr111599.c b/gcc/testsuite/gcc.dg/pr111599.c index 25880b759f7..e2f2542c561 100644 --- a/gcc/testsuite/gcc.dg/pr111599.c +++ b/gcc/testsuite/gcc.dg/pr111599.c @@ -1,6 +1,10 @@ /* { dg-do compile } */ /* { dg-options "-O3 -fno-inline-functions-called-once -fno-inline-small-functions -fno-tree-dce -fno-tree-forwprop -fno-tree-fre" } */ +#if __SIZEOF_INT__ < 4 +#define int __INT32_TYPE__ +#endif + int h(void); void l(int); void func_56(int p_57, unsigned p_58) {