This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
__intN patch 4/5: testsuite updates
- From: DJ Delorie <dj at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 13 Aug 2014 18:11:33 -0400
- Subject: __intN patch 4/5: testsuite updates
- Authentication-results: sourceware.org; auth=none
Changes to the testsuite to make tests more portable to targets with
unusual address spaces.
* testsuite/
* lib/target-supports.exp (check_effective_target_size32plus):
Increase size to avoid false positives on 24-bit address spaces.
* gcc.c-torture/compile/limits-stringlit.c: Skip if msp430.
* gcc.dg/lto/pr54709_1.c: Fix memcpy prototype.
* gcc.dg/torture/pta-ptrarith-3.c: Use __SIZE_TYPE__ instead of "int".
* gcc.dg/torture/pr36373-10.c: Use __SIZE_TYPE__ if present.
* gcc.dg/torture/pr57864.c: Use __SIZE_TYPE__.
* gcc.dg/torture/pr26763-2.c: Use __SIZE_TYPE__ instead of "int".
* gcc.dg/tree-ssa/isolate-3.c: Use __SIZE_TYPE__ instead of "long unsigned int".
* gcc.dg/tree-ssa/isolate-3.c: Likewise.
* gcc.dg/pr52549.c: Use __SIZE_TYPE__ if present.
Index: gcc/testsuite/lib/target-supports.exp
===================================================================
--- gcc/testsuite/lib/target-supports.exp (revision 213886)
+++ gcc/testsuite/lib/target-supports.exp (working copy)
@@ -1806,17 +1806,18 @@ proc check_effective_target_ptr32plus {
return [check_no_compiler_messages ptr32plus object {
int dummy[sizeof (void *) >= 4 ? 1 : -1];
}]
}
# Return 1 if we support 32-bit or larger array and structure sizes
-# using default options, 0 otherwise.
+# using default options, 0 otherwise. Avoid false positive on
+# targets with 20 or 24 bit address spaces.
proc check_effective_target_size32plus { } {
return [check_no_compiler_messages size32plus object {
- char dummy[65537];
+ char dummy[16777217L];
}]
}
# Returns 1 if we're generating 16-bit or smaller integers with the
# default options, 0 otherwise.
Index: gcc/testsuite/gcc.c-torture/compile/limits-stringlit.c
===================================================================
--- gcc/testsuite/gcc.c-torture/compile/limits-stringlit.c (revision 213886)
+++ gcc/testsuite/gcc.c-torture/compile/limits-stringlit.c (working copy)
@@ -1,7 +1,7 @@
-/* { dg-skip-if "Array too big" { avr-*-* picochip-*-* m32c-*-* pdp11-*-* } { "*" } { "" } } */
+/* { dg-skip-if "Array too big" { avr-*-* picochip-*-* m32c-*-* pdp11-*-* msp430-*-* } { "*" } { "" } } */
#define STR2 "012345678901234567890123456789012345678901234567890123456789\
0123456789012345678901234567890123456789"
#define STR3 STR2 STR2 STR2 STR2 STR2 STR2 STR2 STR2 STR2 STR2
#define STR4 STR3 STR3 STR3 STR3 STR3 STR3 STR3 STR3 STR3 STR3
#define STR5 STR4 STR4 STR4 STR4 STR4 STR4 STR4 STR4 STR4 STR4
Index: gcc/testsuite/gcc.dg/lto/pr54709_1.c
===================================================================
--- gcc/testsuite/gcc.dg/lto/pr54709_1.c (revision 213886)
+++ gcc/testsuite/gcc.dg/lto/pr54709_1.c (working copy)
@@ -1,5 +1,5 @@
-void * memcpy (void *, void *, long);
+void * memcpy (void *, void *, __SIZE_TYPE__);
void bar (void *p, void *q, unsigned s)
{
memcpy (p, q, s);
}
Index: gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c (revision 213886)
+++ gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c (working copy)
@@ -6,13 +6,13 @@ extern void abort (void);
struct X {
int *p;
int *q;
int *r;
};
int __attribute__((noinline))
-foo(int i, int j, int k, int off)
+foo(int i, int j, int k, __SIZE_TYPE__ off)
{
struct X x;
int **p, *q;
x.p = &i;
x.q = &j;
x.r = &k;
Index: gcc/testsuite/gcc.dg/torture/pr36373-10.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pr36373-10.c (revision 213886)
+++ gcc/testsuite/gcc.dg/torture/pr36373-10.c (working copy)
@@ -1,9 +1,11 @@
/* { dg-do run } */
-#if (__SIZEOF_LONG_LONG__ == __SIZEOF_POINTER__)
+#ifdef __SIZE_TYPE__
+typedef __SIZE_TYPE__ uintptr_t;
+#elif (__SIZEOF_LONG_LONG__ == __SIZEOF_POINTER__)
typedef unsigned long long uintptr_t;
#elif (__SIZEOF_LONG__ == __SIZEOF_POINTER__)
typedef unsigned long uintptr_t;
#elif (__SIZEOF_INT__ == __SIZEOF_POINTER__)
typedef unsigned int uintptr_t;
#else
Index: gcc/testsuite/gcc.dg/torture/pr57864.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pr57864.c (revision 213886)
+++ gcc/testsuite/gcc.dg/torture/pr57864.c (working copy)
@@ -12,18 +12,18 @@ int c;
static void fn1(union U *p1, int p2, _Bool p3)
{
union U *e;
if (p2 == 0)
- a = ((union U*)((unsigned long)p1 & ~1))->val;
+ a = ((union U*)((__SIZE_TYPE__)p1 & ~1))->val;
if (b) {
e = p1;
} else if (c) {
- e = ((union U*)((unsigned long)p1 & ~1))->ptr;
+ e = ((union U*)((__SIZE_TYPE__)p1 & ~1))->ptr;
d = e;
} else {
e = 0;
d = ((union U*)0)->ptr;
}
Index: gcc/testsuite/gcc.dg/torture/pr26763-2.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pr26763-2.c (revision 213886)
+++ gcc/testsuite/gcc.dg/torture/pr26763-2.c (working copy)
@@ -1,11 +1,11 @@
/* { dg-do run } */
extern void abort(void);
-int try (char *a, int d)
+int try (char *a, __SIZE_TYPE__ d)
{
return a + d > a;
}
int main(void)
{
Index: gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c (revision 213886)
+++ gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c (working copy)
@@ -1,12 +1,12 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fdump-tree-isolate-paths" } */
/* { dg-skip-if "" keeps_null_pointer_checks } */
-typedef long unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
extern void *memset (void *__s, int __c, size_t __n)
__attribute__ ((__nothrow__, __leaf__)) __attribute__ ((__nonnull__ (1)));
struct rtx_def;
typedef struct rtx_def *rtx;
typedef struct VEC_rtx_base
Index: gcc/testsuite/gcc.dg/pr52549.c
===================================================================
--- gcc/testsuite/gcc.dg/pr52549.c (revision 213886)
+++ gcc/testsuite/gcc.dg/pr52549.c (working copy)
@@ -1,9 +1,14 @@
/* { dg-do compile } */
-#if __SIZEOF_POINTER__ == __SIZEOF_LONG__
+#ifdef __SIZE_TYPE__
+_mark (__SIZE_TYPE__ obj, int i, char *a)
+{
+ (char *)&(((long *)(obj)) [i]) - a;
+}
+#elif __SIZEOF_POINTER__ == __SIZEOF_LONG__
_mark (long obj, int i, char *a)
{
(char *)&(((long *)(obj)) [i]) - a;
}
#elif __SIZEOF_POINTER__ == __SIZEOF_INT__
_mark (int obj, int i, char *a)