From 7d60b1b78538c5606e8d35cdba8f565e7785d9c6 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Sun, 7 Jan 2024 13:17:19 +0100
Subject: [PATCH] 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__.
---
gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c | 1 +
gcc/testsuite/gcc.dg/builtin-object-size-1.c | 4 ++++
gcc/testsuite/gcc.dg/builtin-object-size-2.c | 4 ++++
gcc/testsuite/gcc.dg/builtin-object-size-3.c | 4 ++++
gcc/testsuite/gcc.dg/builtin-object-size-4.c | 4 ++++
gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-2.c | 4 ++++
gcc/testsuite/gcc.dg/debug/btf/btf-pr106773.c | 4 ++--
gcc/testsuite/gcc.dg/memchr-3.c | 2 +-
gcc/testsuite/gcc.dg/pr103207.c | 2 +-
gcc/testsuite/gcc.dg/pr103451.c | 2 +-
gcc/testsuite/gcc.dg/pr109977.c | 4 ++--
gcc/testsuite/gcc.dg/pr110496.c | 2 +-
gcc/testsuite/gcc.dg/pr110506-2.c | 2 +-
gcc/testsuite/gcc.dg/pr110582.c | 1 +
gcc/testsuite/gcc.dg/pr111039.c | 4 ++++
gcc/testsuite/gcc.dg/pr111070.c | 4 ++--
gcc/testsuite/gcc.dg/pr111599.c | 4 ++++
17 files changed, 41 insertions(+), 11 deletions(-)
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 07e3da6f254f..c3ac6230d4de 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 db325801f936..64c4bc4da394 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 4c71b1f6a37f..da10b6b06324 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 3d907ef4814a..f23873bec38e 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 c9af07499a45..dcb042f34b69 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 03c323a6d49b..2ec00dc6796e 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 f90fa773a4be..940f129408dc 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__ 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 9c73265a89ee..9a3573519500 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 69c0f555f86c..b3043f471fb6 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 db724aa12338..6fa84b406b30 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 03d9a3331348..c0be161ef4e7 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 3c3d12fb5324..5a168fde3e1a 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 aabca0fa156a..4bc9089a206b 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 ae0650d3ae78..6607cf5c895e 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 bec9983b35f8..a64c46c7edcd 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 1ebc7adf7829..1de3a3680fe3 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 25880b759f77..e2f2542c5612 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) {
--
GitLab