This patch fixes some test cases that failed due to sloppyness,
like:
typedef unsigned int u32;
instead of:
typedef __UINT32_TYPE__ u32;
On avr, many test failed to produce expected warnings since
strcmp etc. is implemented as asm in a gnu inline wrapper.
Applied to trunk.
Johann
--
PR testsuite/52641
gcc/testsuite/
* c-c++-common/analyzer/taint-index-pr106229.c: Require size20plus.
* c-c++-common/analyzer/stdarg-pr111289-int.c [int16]: One
warning won't show up.
* c-c++-common/analyzer/pr96653.c: Use correct types to
define u16, u32, s64, size_t, etc.
* c-c++-common/analyzer/allocation-size-pr113654-1.c: Same.
* c-c++-common/analyzer/out-of-bounds-pr112792.c: Same.
* c-c++-common/analyzer/realloc-pr110014.c: Same.
* c-c++-common/analyzer/uninit-pr108704.c: Same.
* gcc.dg/analyzer/CWE-131-examples.c: Same.
* gcc.dg/analyzer/deref-before-check-pr113253.c: Same.
* gcc.dg/analyzer/torture/switch-3.c: Same.
* gcc.dg/analyzer/torture/switch-4.c: Same.
* gcc.dg/analyzer/torture/switch-enum-pr105273-doom-p_floor.c: Same.
* gcc.dg/analyzer/atoi-1.c [avr]: Hide one function.
* c-c++-common/analyzer/coreutils-sum-pr108666.c [avr-*-*]: Skip.
* c-c++-common/analyzer/flex-without-call-summaries.c: Same.
* c-c++-common/analyzer/out-of-bounds-1.c: Same.
* c-c++-common/analyzer/out-of-bounds-2.c: Same.
* c-c++-common/analyzer/out-of-bounds-3.c: Same.
* c-c++-common/analyzer/out-of-bounds-diagram-strcat-2.c: Same.
* c-c++-common/analyzer/out-of-bounds-diagram-strcat.c: Same.
* c-c++-common/analyzer/overlapping-buffers.c: Same.
* gcc.dg/analyzer/SARD-tc293-basic-00045-min.c: Same.
* gcc.dg/analyzer/data-model-1.c: Same.
* gcc.dg/analyzer/fd-mktemp-family.c: Same.
* gcc.dg/analyzer/mkdtemp-1.c: Same.
* gcc.dg/analyzer/mkostemp-1.c: Same.
* gcc.dg/analyzer/mkostemps-1.c: Same.
* gcc.dg/analyzer/mkstemp-1.c: Same.
* gcc.dg/analyzer/mkstemps-1.c: Same.
* gcc.dg/analyzer/mktemp-1.c: Same.
* gcc.dg/analyzer/out-of-bounds-4.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-13.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-15.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-16.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-17.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-18.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-19.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-4.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-5-ascii.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-5-unicode.c: Same.
* gcc.dg/analyzer/out-of-bounds-diagram-7.c: Same.
* gcc.dg/analyzer/strcmp-1.c: Same.
* gcc.dg/analyzer/strcpy-1.c: Same.
* gcc.dg/analyzer/strcpy-3.c: Same.
* gcc.dg/analyzer/strcpy-4.c: Same.
* gcc.dg/analyzer/taint-read-offset-1.c: Same.
* gcc.dg/analyzer/taint-write-offset-1.c: Same.diff --git a/gcc/testsuite/c-c++-common/analyzer/allocation-size-pr113654-1.c b/gcc/testsuite/c-c++-common/analyzer/allocation-size-pr113654-1.c
index b7bfc5fec72..ece7845496e 100644
--- a/gcc/testsuite/c-c++-common/analyzer/allocation-size-pr113654-1.c
+++ b/gcc/testsuite/c-c++-common/analyzer/allocation-size-pr113654-1.c
@@ -3,8 +3,8 @@
#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
/* Reduced from Linux kernel's drivers/gpu/drm/i915/display/intel_bios.c */
-typedef unsigned short u16;
-typedef unsigned int u32;
+typedef __UINT16_TYPE__ u16;
+typedef __UINT32_TYPE__ u32;
typedef unsigned long __kernel_size_t;
typedef __kernel_size_t size_t;
diff --git a/gcc/testsuite/c-c++-common/analyzer/coreutils-sum-pr108666.c b/gcc/testsuite/c-c++-common/analyzer/coreutils-sum-pr108666.c
index 95091e712ce..9ee352dd1b9 100644
--- a/gcc/testsuite/c-c++-common/analyzer/coreutils-sum-pr108666.c
+++ b/gcc/testsuite/c-c++-common/analyzer/coreutils-sum-pr108666.c
@@ -1,6 +1,7 @@
/* Reduced from coreutils's sum.c: bsd_sum_stream */
/* { dg-additional-options "-fno-exceptions" } */
+/* { dg-skip-if "" { avr-*-* } } */
typedef __SIZE_TYPE__ size_t;
typedef unsigned char __uint8_t;
diff --git a/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c b/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c
index 2fff8fb9328..410678e289c 100644
--- a/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c
+++ b/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c
@@ -8,6 +8,7 @@
/* { dg-skip-if "requires hosted libstdc++ for stdlib malloc" { ! hostedlib } } */
/* { dg-skip-if "C++98 builds hit different limits exploring egraph" { c++98_only } } */
+/* { dg-skip-if "isatty" { avr-*-* } } */
/* A lexical scanner generated by flex */
diff --git a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-1.c b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-1.c
index 16b2271bb93..7a64aa761fa 100644
--- a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-1.c
+++ b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-1.c
@@ -1,4 +1,4 @@
-/* { dg-skip-if "requires hosted libstdc++ for stdlib malloc" { ! hostedlib } } */
+/* { dg-skip-if "requires hosted libstdc++ for stdlib malloc" { { ! hostedlib } || { avr-*-* } } } */
#include <stdlib.h>
#include <string.h>
diff --git a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-2.c b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-2.c
index 0e1aba59fef..ee400820dd5 100644
--- a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-2.c
+++ b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-2.c
@@ -1,4 +1,4 @@
-/* { dg-skip-if "requires hosted libstdc++ for stdlib malloc" { ! hostedlib } } */
+/* { dg-skip-if "requires hosted libstdc++ for stdlib malloc" { { ! hostedlib } || { avr-*-* } } } */
#include <stdlib.h>
#include <string.h>
diff --git a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-3.c b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-3.c
index 5fd9cc3c6b1..307c92019d2 100644
--- a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-3.c
+++ b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-3.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
diff --git a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat-2.c b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat-2.c
index b129518d759..821723df410 100644
--- a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat-2.c
+++ b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat-2.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat.c b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat.c
index 53c128a4fa1..2e81ee6e984 100644
--- a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat.c
+++ b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-diagram-strcat.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode -Wno-stringop-overflow" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-pr112792.c b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-pr112792.c
index 0bc7413ce5d..2f589c9414b 100644
--- a/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-pr112792.c
+++ b/gcc/testsuite/c-c++-common/analyzer/out-of-bounds-pr112792.c
@@ -1,7 +1,7 @@
/* PR analyzer/112792 ("-Wanalyzer-out-of-bounds false positives seen on
Linux kernel with certain unions"). */
-typedef unsigned int u32;
+typedef __UINT32_TYPE__ u32;
union msix_perm {
struct {
diff --git a/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers.c b/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers.c
index f02238dfa42..66fa8cedb8b 100644
--- a/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers.c
+++ b/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
/* Test of -Wanalyzer-overlapping-buffers. */
#include <string.h>
diff --git a/gcc/testsuite/c-c++-common/analyzer/pr96653.c b/gcc/testsuite/c-c++-common/analyzer/pr96653.c
index 75f3d23aa98..e473dd8e087 100644
--- a/gcc/testsuite/c-c++-common/analyzer/pr96653.c
+++ b/gcc/testsuite/c-c++-common/analyzer/pr96653.c
@@ -3,9 +3,9 @@
/* { dg-additional-options "-O1" } */
-typedef unsigned int u32;
-typedef long long s64;
-typedef unsigned long long u64;
+typedef __UINT32_TYPE__ u32;
+typedef __INT64_TYPE__ s64;
+typedef __UINT64_TYPE__ u64;
enum v4l2_ctrl_type {
V4L2_CTRL_TYPE_INTEGER = 1,
diff --git a/gcc/testsuite/c-c++-common/analyzer/realloc-pr110014.c b/gcc/testsuite/c-c++-common/analyzer/realloc-pr110014.c
index e25722a3328..7f4950a3d8d 100644
--- a/gcc/testsuite/c-c++-common/analyzer/realloc-pr110014.c
+++ b/gcc/testsuite/c-c++-common/analyzer/realloc-pr110014.c
@@ -1,9 +1,9 @@
-void *realloc (void *, unsigned long)
+void *realloc (void *, __SIZE_TYPE__)
__attribute__((__nothrow__, __leaf__))
__attribute__((__warn_unused_result__)) __attribute__((__alloc_size__ (2)));
long *
-slurp (long *buffer, unsigned long file_size)
+slurp (long *buffer, __SIZE_TYPE__ file_size)
{
unsigned long cc;
if (!__builtin_add_overflow (file_size - file_size % sizeof (long),
@@ -13,13 +13,13 @@ slurp (long *buffer, unsigned long file_size)
}
long *
-slurp1 (long *buffer, unsigned long file_size)
+slurp1 (long *buffer, __SIZE_TYPE__ file_size)
{
return (long *) realloc (buffer, file_size - file_size % sizeof (long));
}
long *
-slurp2 (long *buffer, unsigned long file_size)
+slurp2 (long *buffer, __SIZE_TYPE__ file_size)
{
return (long *) realloc (buffer, (file_size / sizeof (long)) * sizeof (long));
}
diff --git a/gcc/testsuite/c-c++-common/analyzer/stdarg-pr111289-int.c b/gcc/testsuite/c-c++-common/analyzer/stdarg-pr111289-int.c
index 8faa58c9480..a96a91f3c9f 100644
--- a/gcc/testsuite/c-c++-common/analyzer/stdarg-pr111289-int.c
+++ b/gcc/testsuite/c-c++-common/analyzer/stdarg-pr111289-int.c
@@ -35,7 +35,7 @@ test_2 (char const *name, ...)
va_list arg;
va_start (arg, name);
- global_2 = va_arg (arg, int16_t); /* { dg-warning "promoted to 'int'" } */
+ global_2 = va_arg (arg, int16_t); /* { dg-warning "promoted to 'int'" "" { target { ! int16 } } } */
va_end (arg);
}
diff --git a/gcc/testsuite/c-c++-common/analyzer/taint-index-pr106229.c b/gcc/testsuite/c-c++-common/analyzer/taint-index-pr106229.c
index 76dca630a03..e1a043afea4 100644
--- a/gcc/testsuite/c-c++-common/analyzer/taint-index-pr106229.c
+++ b/gcc/testsuite/c-c++-common/analyzer/taint-index-pr106229.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target size20plus } */
+
#include <stdint.h>
/* Attacker-controlled 8 bit values where the array isn't
diff --git a/gcc/testsuite/c-c++-common/analyzer/uninit-pr108704.c b/gcc/testsuite/c-c++-common/analyzer/uninit-pr108704.c
index ebf8151e58f..404d6320515 100644
--- a/gcc/testsuite/c-c++-common/analyzer/uninit-pr108704.c
+++ b/gcc/testsuite/c-c++-common/analyzer/uninit-pr108704.c
@@ -1,6 +1,6 @@
-typedef unsigned short int __uint16_t;
-typedef unsigned int __uint32_t;
-typedef unsigned long int __uint64_t;
+typedef __UINT16_TYPE__ __uint16_t;
+typedef __UINT32_TYPE__ __uint32_t;
+typedef __UINT64_TYPE__ __uint64_t;
typedef __uint16_t uint16_t;
typedef __uint32_t uint32_t;
typedef __uint64_t uint64_t;
diff --git a/gcc/testsuite/gcc.dg/analyzer/CWE-131-examples.c b/gcc/testsuite/gcc.dg/analyzer/CWE-131-examples.c
index 24b56ce5cd3..efcee604fe4 100644
--- a/gcc/testsuite/gcc.dg/analyzer/CWE-131-examples.c
+++ b/gcc/testsuite/gcc.dg/analyzer/CWE-131-examples.c
@@ -133,10 +133,10 @@ void example_4 (DataPacket *packet)
void example_5 (void)
{
- int *id_sequence;
+ __INT32_TYPE__ *id_sequence;
/* Allocate space for an array of three ids. */
- id_sequence = (int*) malloc(3); /* { dg-warning "allocated buffer size is not a multiple of the pointee's size" } */
+ id_sequence = (__INT32_TYPE__*) malloc(3); /* { dg-warning "allocated buffer size is not a multiple of the pointee's size" } */
if (id_sequence == NULL) exit(1);
/* Populate the id array. */
diff --git a/gcc/testsuite/gcc.dg/analyzer/SARD-tc293-basic-00045-min.c b/gcc/testsuite/gcc.dg/analyzer/SARD-tc293-basic-00045-min.c
index 36c1946b197..7d80b0718a6 100644
--- a/gcc/testsuite/gcc.dg/analyzer/SARD-tc293-basic-00045-min.c
+++ b/gcc/testsuite/gcc.dg/analyzer/SARD-tc293-basic-00045-min.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
/* Adapted from https://samate.nist.gov/SARD/test-cases/293/versions/1.0.0
Part of https://samate.nist.gov/SARD/test-suites/81
See:
diff --git a/gcc/testsuite/gcc.dg/analyzer/atoi-1.c b/gcc/testsuite/gcc.dg/analyzer/atoi-1.c
index 5b008bf9b73..aa2cfe97f75 100644
--- a/gcc/testsuite/gcc.dg/analyzer/atoi-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/atoi-1.c
@@ -22,6 +22,8 @@ void test_valid_atol(void) {
long val = atol("123"); /* Should be fine. */
}
+#ifndef __AVR__
void test_valid_atoll(void) {
long long val = atoll("123"); /* Should be fine. */
}
+#endif
diff --git a/gcc/testsuite/gcc.dg/analyzer/data-model-1.c b/gcc/testsuite/gcc.dg/analyzer/data-model-1.c
index 35699e0bb1e..f55634d52dc 100644
--- a/gcc/testsuite/gcc.dg/analyzer/data-model-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/data-model-1.c
@@ -1,4 +1,5 @@
/* { dg-additional-options "-fno-ipa-modref" } */
+/* { dg-skip-if "" { avr-*-* } } */
#include <stdlib.h>
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/deref-before-check-pr113253.c b/gcc/testsuite/gcc.dg/analyzer/deref-before-check-pr113253.c
index 1890312cc1a..0bd61397d44 100644
--- a/gcc/testsuite/gcc.dg/analyzer/deref-before-check-pr113253.c
+++ b/gcc/testsuite/gcc.dg/analyzer/deref-before-check-pr113253.c
@@ -45,10 +45,10 @@ enum More_Lisp_Bits
PSEUDOVECTOR_SIZE_BITS = 12,
PSEUDOVECTOR_REST_BITS = 12,
PSEUDOVECTOR_AREA_BITS = PSEUDOVECTOR_SIZE_BITS + PSEUDOVECTOR_REST_BITS,
- PVEC_TYPE_MASK = 0x3f << PSEUDOVECTOR_AREA_BITS
+ PVEC_TYPE_MASK = (__UINT32_TYPE__) 0x3f << PSEUDOVECTOR_AREA_BITS
};
static inline _Bool
-PSEUDOVECTORP(Lisp_Object a, int code)
+PSEUDOVECTORP(Lisp_Object a, __INT32_TYPE__ code)
{
return (
((((union vectorlike_header*)((uintptr_t)XLP((a)) -
diff --git a/gcc/testsuite/gcc.dg/analyzer/fd-mktemp-family.c b/gcc/testsuite/gcc.dg/analyzer/fd-mktemp-family.c
index db690256c05..67a5cfcf695 100644
--- a/gcc/testsuite/gcc.dg/analyzer/fd-mktemp-family.c
+++ b/gcc/testsuite/gcc.dg/analyzer/fd-mktemp-family.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "fcntl,unistd" { avr-*-* } } */
+
/* Tests for fd leak and errno handling of mktemp-family functions. */
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
diff --git a/gcc/testsuite/gcc.dg/analyzer/mkdtemp-1.c b/gcc/testsuite/gcc.dg/analyzer/mkdtemp-1.c
index 2cc339b9a65..061b75d291d 100644
--- a/gcc/testsuite/gcc.dg/analyzer/mkdtemp-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/mkdtemp-1.c
@@ -1,4 +1,5 @@
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
+/* { dg-skip-if "incomplete stdio" { avr-*-* } } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/mkostemp-1.c b/gcc/testsuite/gcc.dg/analyzer/mkostemp-1.c
index 55135ffd947..539377c1ee0 100644
--- a/gcc/testsuite/gcc.dg/analyzer/mkostemp-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/mkostemp-1.c
@@ -1,5 +1,6 @@
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
/* { dg-prune-output "leak of file descriptor" } */
+/* { dg-skip-if "incomplete stdio" { avr-*-* } } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/mkostemps-1.c b/gcc/testsuite/gcc.dg/analyzer/mkostemps-1.c
index 013906092d5..7961c8b6f63 100644
--- a/gcc/testsuite/gcc.dg/analyzer/mkostemps-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/mkostemps-1.c
@@ -1,5 +1,6 @@
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
/* { dg-prune-output "leak of file descriptor" } */
+/* { dg-skip-if "incomplete stdio" { avr-*-* } } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/mkstemp-1.c b/gcc/testsuite/gcc.dg/analyzer/mkstemp-1.c
index e7a7a724abf..300defe163e 100644
--- a/gcc/testsuite/gcc.dg/analyzer/mkstemp-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/mkstemp-1.c
@@ -1,5 +1,6 @@
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
/* { dg-prune-output "leak of file descriptor" } */
+/* { dg-skip-if "incomplete stdio" { avr-*-* } } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/mkstemps-1.c b/gcc/testsuite/gcc.dg/analyzer/mkstemps-1.c
index 6f1e7ef3e73..18c0d8cd9dd 100644
--- a/gcc/testsuite/gcc.dg/analyzer/mkstemps-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/mkstemps-1.c
@@ -1,5 +1,6 @@
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
/* { dg-prune-output "leak of file descriptor" } */
+/* { dg-skip-if "incomplete stdio" { avr-*-* } } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/mktemp-1.c b/gcc/testsuite/gcc.dg/analyzer/mktemp-1.c
index 0f1122a06ed..c947ce7f4cd 100644
--- a/gcc/testsuite/gcc.dg/analyzer/mktemp-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/mktemp-1.c
@@ -1,4 +1,5 @@
/* { dg-additional-options "-Wno-analyzer-null-argument" } */
+/* { dg-skip-if "incomplete stdio" { avr-*-* } } */
/* TODO: mktemp is deprecated per MSC24-C
(https://wiki.sei.cmu.edu/confluence/x/hNYxBQ).
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-4.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-4.c
index 9cd8bda76c3..ab02a6b2b60 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-4.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-4.c
@@ -1,4 +1,6 @@
/* { dg-additional-options "-Wno-stringop-overflow -Wno-stringop-truncation" } */
+/* { dg-skip-if "strcpy is asm" { avr-*-* } } */
+
#include <string.h>
/* Wanalyzer-out-of-bounds tests for strpy-related overflows.
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-13.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-13.c
index 9b2d6b304ab..87e8afeb7ef 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-13.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-13.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-15.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-15.c
index 411b84c3268..95305678251 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-15.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-15.c
@@ -1,7 +1,7 @@
/* Regression test for ICE with short values of
--param=analyzer-text-art-string-ellipsis-threshold=. */
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode --param=analyzer-text-art-string-ellipsis-threshold=0" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-16.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-16.c
index b0fb409267e..ea4e76d495e 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-16.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-16.c
@@ -1,4 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
+/* { dg-skip-if "" { avr-*-* } } */
#include <string.h>
#include "analyzer-decls.h"
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-17.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-17.c
index 62234a91d0e..78979b20374 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-17.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-17.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-18.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-18.c
index 3fcf18a4ad7..febf4bc8bd4 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-18.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-18.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-19.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-19.c
index 6af5c0f301b..c839f9065ad 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-19.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-19.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode -Wno-stringop-overflow" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-4.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-4.c
index d5d72482843..d9121ca5a10 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-4.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-4.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-ascii.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-ascii.c
index a0cdcbe0669..6c93c5fe6b8 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-ascii.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-ascii.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=ascii" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-unicode.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-unicode.c
index 3111a6fccf2..373c4da59ea 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-unicode.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-5-unicode.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-7.c b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-7.c
index 5e3f9a74d31..943842ae039 100644
--- a/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-7.c
+++ b/gcc/testsuite/gcc.dg/analyzer/out-of-bounds-diagram-7.c
@@ -1,5 +1,5 @@
/* { dg-additional-options "-fdiagnostics-text-art-charset=unicode" } */
-/* { dg-skip-if "" { powerpc-ibm-aix* } } */
+/* { dg-skip-if "" { avr-*-* powerpc-ibm-aix* } } */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/strcmp-1.c b/gcc/testsuite/gcc.dg/analyzer/strcmp-1.c
index 6b7d8a2aa46..219ba77c97e 100644
--- a/gcc/testsuite/gcc.dg/analyzer/strcmp-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/strcmp-1.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
/* Verify that we clarify the sense of paths involving strcmp. */
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/strcpy-1.c b/gcc/testsuite/gcc.dg/analyzer/strcpy-1.c
index 78075f1da5e..cd37774bae0 100644
--- a/gcc/testsuite/gcc.dg/analyzer/strcpy-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/strcpy-1.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
#include <string.h>
#include "analyzer-decls.h"
diff --git a/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c b/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c
index a7b324fc445..582bb075bfb 100644
--- a/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c
+++ b/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
#include <string.h>
#include "analyzer-decls.h"
diff --git a/gcc/testsuite/gcc.dg/analyzer/strcpy-4.c b/gcc/testsuite/gcc.dg/analyzer/strcpy-4.c
index 435a4cadee9..acc723b3bb8 100644
--- a/gcc/testsuite/gcc.dg/analyzer/strcpy-4.c
+++ b/gcc/testsuite/gcc.dg/analyzer/strcpy-4.c
@@ -1,4 +1,5 @@
/* { dg-additional-options "-Wno-stringop-overflow" } */
+/* { dg-skip-if "" { avr-*-* } } */
#include <string.h>
#include "analyzer-decls.h"
diff --git a/gcc/testsuite/gcc.dg/analyzer/taint-read-offset-1.c b/gcc/testsuite/gcc.dg/analyzer/taint-read-offset-1.c
index bb5d0930cdb..b7eda16ac87 100644
--- a/gcc/testsuite/gcc.dg/analyzer/taint-read-offset-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/taint-read-offset-1.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/taint-write-offset-1.c b/gcc/testsuite/gcc.dg/analyzer/taint-write-offset-1.c
index 06b5f1b4e02..0602ab059ec 100644
--- a/gcc/testsuite/gcc.dg/analyzer/taint-write-offset-1.c
+++ b/gcc/testsuite/gcc.dg/analyzer/taint-write-offset-1.c
@@ -1,3 +1,5 @@
+/* { dg-skip-if "" { avr-*-* } } */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gcc/testsuite/gcc.dg/analyzer/torture/switch-3.c b/gcc/testsuite/gcc.dg/analyzer/torture/switch-3.c
index b40be664d38..43bb8fa56c4 100644
--- a/gcc/testsuite/gcc.dg/analyzer/torture/switch-3.c
+++ b/gcc/testsuite/gcc.dg/analyzer/torture/switch-3.c
@@ -1,5 +1,7 @@
-typedef unsigned int __u32;
-__extension__ typedef unsigned long long __u64;
+/* { dg-require-effective-target int32plus } */
+
+typedef __UINT32_TYPE__ __u32;
+__extension__ typedef __UINT64_TYPE__ __u64;
extern unsigned long
copy_from_user(void *to, const void *from, unsigned long n);
diff --git a/gcc/testsuite/gcc.dg/analyzer/torture/switch-4.c b/gcc/testsuite/gcc.dg/analyzer/torture/switch-4.c
index f5cdb5cea01..43fed32a108 100644
--- a/gcc/testsuite/gcc.dg/analyzer/torture/switch-4.c
+++ b/gcc/testsuite/gcc.dg/analyzer/torture/switch-4.c
@@ -1,6 +1,6 @@
struct snd_ac97 {
// snip
- unsigned int id;
+ __UINT32_TYPE__ id;
// snip
};
diff --git a/gcc/testsuite/gcc.dg/analyzer/torture/switch-enum-pr105273-doom-p_floor.c b/gcc/testsuite/gcc.dg/analyzer/torture/switch-enum-pr105273-doom-p_floor.c
index 100586cdc88..89f90840a30 100644
--- a/gcc/testsuite/gcc.dg/analyzer/torture/switch-enum-pr105273-doom-p_floor.c
+++ b/gcc/testsuite/gcc.dg/analyzer/torture/switch-enum-pr105273-doom-p_floor.c
@@ -1,11 +1,11 @@
/* Reduced from linuxdoom-1.10's p_floor.c (GPLv2). */
#define FRACBITS 16
-#define FRACUNIT (1<<FRACBITS)
+#define FRACUNIT ((__INT32_TYPE__)1<<FRACBITS)
#define PU_LEVSPEC 51
#define FLOORSPEED FRACUNIT
-typedef int fixed_t;
+typedef __INT32_TYPE__ fixed_t;
typedef struct line_s line_t;
typedef struct
@@ -30,7 +30,7 @@ typedef struct
extern sector_t* sectors;
-void* Z_Malloc (int size, int tag, void *ptr);
+void* Z_Malloc (__SIZE_TYPE__ size, int tag, void *ptr);
int
P_FindSectorFromLineTag
