|
From: <sv...@va...> - 2006-10-17 11:09:05
|
Author: sewardj
Date: 2006-10-17 12:09:03 +0100 (Tue, 17 Oct 2006)
New Revision: 6306
Log:
Change a bunch of pointer <-> int casts to pointer <-> long casts so
as to stop gcc complaining so much on 64-bit platforms.
Modified:
trunk/helgrind/tests/readshared.c
trunk/memcheck/tests/brk.c
trunk/none/tests/amd64/faultstatus.c
trunk/none/tests/susphello.c
trunk/none/tests/threaded-fork.c
trunk/tests/toobig-allocs.c
Modified: trunk/helgrind/tests/readshared.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/helgrind/tests/readshared.c 2006-10-17 11:08:12 UTC (rev 6305)
+++ trunk/helgrind/tests/readshared.c 2006-10-17 11:09:03 UTC (rev 6306)
@@ -7,12 +7,12 @@
=20
static void *t1(void *v)
{
- return (void *)(shared + 44);
+ return (void *)(long)(shared + 44);
}
=20
static void *t2(void *v)
{
- return (void *)(shared + 55);
+ return (void *)(long)(shared + 55);
}
=20
int main()
Modified: trunk/memcheck/tests/brk.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/brk.c 2006-10-17 11:08:12 UTC (rev 6305)
+++ trunk/memcheck/tests/brk.c 2006-10-17 11:09:03 UTC (rev 6306)
@@ -37,7 +37,7 @@
assert( 0 =3D=3D brk(orig_ds) ); // libc brk()
=20
for (i =3D 0; EOL !=3D vals[i]; i++) {
- res =3D (void*)brk(vals[i]);
+ res =3D (void*)(long)brk(vals[i]);
}
=20
return 0;
Modified: trunk/none/tests/amd64/faultstatus.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/amd64/faultstatus.c 2006-10-17 11:08:12 UTC (rev 630=
5)
+++ trunk/none/tests/amd64/faultstatus.c 2006-10-17 11:09:03 UTC (rev 630=
6)
@@ -18,8 +18,6 @@
=20
static const struct test *cur_test;
=20
-static int zero();
-
static jmp_buf escape;
=20
#define BADADDR ((int *)0x1234)
@@ -137,7 +135,3 @@
return 0;
}
=20
-static int zero()
-{
- return 0;
-}
Modified: trunk/none/tests/susphello.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/susphello.c 2006-10-17 11:08:12 UTC (rev 6305)
+++ trunk/none/tests/susphello.c 2006-10-17 11:09:03 UTC (rev 6306)
@@ -46,7 +46,7 @@
{
//ucontext_t *ucontext =3D (ucontext_t *)arg;
=20
- int mypos =3D (int) pthread_getspecific(pKey);
+ long mypos =3D (long) pthread_getspecific(pKey);
=20
=20
// int threadPos =3D (int)pthread_getspecific(srThreadKey);
@@ -185,8 +185,8 @@
}
=20
void *threadfunc(void *arg) {
- int mypos =3D (int)arg;
- int i;
+ long mypos =3D (long)arg;
+ long i;
long square =3D 1;
void* altstack =3D setup_altstack();
=20
@@ -217,10 +217,10 @@
int main(int argc, char ** argv) {
pthread_t threads[THREAD_COUNT];
pthread_attr_t attr;
- int result;
- int i;
- int iteration;
- int finished;
+ long result;
+ long i;
+ long iteration;
+ long finished;
=20
initSignalling();
=20
Modified: trunk/none/tests/threaded-fork.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/threaded-fork.c 2006-10-17 11:08:12 UTC (rev 6305)
+++ trunk/none/tests/threaded-fork.c 2006-10-17 11:09:03 UTC (rev 6306)
@@ -8,7 +8,7 @@
=20
static void *threadmain( void *dummy )
{
- sleep( (int)dummy );
+ sleep( (unsigned long)dummy );
return NULL;
}
=20
Modified: trunk/tests/toobig-allocs.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/toobig-allocs.c 2006-10-17 11:08:12 UTC (rev 6305)
+++ trunk/tests/toobig-allocs.c 2006-10-17 11:09:03 UTC (rev 6306)
@@ -20,7 +20,7 @@
fprintf(stderr, "Attempting too-big mmap()...\n");
p =3D mmap( 0, size, PROT_READ|PROT_WRITE|PROT_EXEC,
MAP_PRIVATE|MAP_ANON, -1, 0 );
- if (-1 !=3D (int)p)
+ if (-1 !=3D (long)p)
fprintf(stderr, "huge mmap() succeeded??\n");
=20
return 0;
|