summaryrefslogtreecommitdiff
path: root/dlfcn
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-08-15 03:58:56 +0000
committerUlrich Drepper <drepper@redhat.com>2003-08-15 03:58:56 +0000
commitd57a3f0e0219dec6406f3477fe2eee21054c7e9c (patch)
treebd5bca09e9be0d4014810dadc6aba5fb68a52d91 /dlfcn
parent1ee598e6cd5225d53eddddb382a5403e045f9e70 (diff)
downloadglibc-d57a3f0e0219dec6406f3477fe2eee21054c7e9c.tar.gz
Update.
2003-08-11 Carlos O'Donell <carlos@baldric.uwo.ca> * dlfcn/default.c (main): Cast dlsym loaded value to same type as main. Address passed to test_in_mod1 and test_in_mod2 without casting. * dlfcn/defaultmod1.c: Change prototype of test_in_mod1. (test_in_mod1): Cast dlsym loaded value to same type as mainp. * dlfcn/defaultmod2.c: Change prototype of test_in_mod2. (test_in_mod2): Cast dlsym loaded value to same type as mainp. 2003-08-15 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/sparc32/elf/configure.in (libc_cv_sparc32_tls): Change quotes before using []. * sysdeps/unix/sysv/linux/sparc/sys/user.h: New file. * sysdeps/sparc/sparc32/bits/atomic.h (__sparc32_atomic_lock): Renamed to... (__sparc32_atomic_locks): ...this. Change into 64-byte array. (__sparc32_atomic_do_lock, __sparc32_atomic_do_unlock): Add addr argument. Select one of 64 locks from address bits. (atomic_compare_and_exchange_val_acq, atomic_compare_and_exchange_bool_acq): Pass memory address to __sparc32_atomic_do_{,un}lock.
Diffstat (limited to 'dlfcn')
-rw-r--r--dlfcn/default.c6
-rw-r--r--dlfcn/defaultmod1.c6
-rw-r--r--dlfcn/defaultmod2.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/dlfcn/default.c b/dlfcn/default.c
index e5d5275ff5..eeed5a950a 100644
--- a/dlfcn/default.c
+++ b/dlfcn/default.c
@@ -36,7 +36,7 @@ main (int argc, char *argv[])
printf ("%s: main not found\n", __FILE__);
result = 1;
}
- else if (p != (void *) &main)
+ else if ((int (*)(int, char **))p != main)
{
printf ("%s: wrong address returned for main\n", __FILE__);
result = 1;
@@ -72,9 +72,9 @@ main (int argc, char *argv[])
else
printf ("%s: found_in_mod2 correctly found\n", __FILE__);
- result |= test_in_mod1 ((void *) &main);
+ result |= test_in_mod1 (main);
- result |= test_in_mod2 ((void *) &main);
+ result |= test_in_mod2 (main);
return result;
}
diff --git a/dlfcn/defaultmod1.c b/dlfcn/defaultmod1.c
index 9f330b7f29..47d229d6b0 100644
--- a/dlfcn/defaultmod1.c
+++ b/dlfcn/defaultmod1.c
@@ -9,9 +9,9 @@ found_in_mod1 (void)
}
-extern int test_in_mod1 (void *mainp);
+extern int test_in_mod1 (int (*mainp)(int, char **));
int
-test_in_mod1 (void *mainp)
+test_in_mod1 (int (*mainp)(int, char **))
{
int (*ifp) (void);
void *p;
@@ -24,7 +24,7 @@ test_in_mod1 (void *mainp)
printf ("%s: main not found\n", __FILE__);
result = 1;
}
- else if (p != mainp)
+ else if ((int (*)(int, char **))p != mainp)
{
printf ("%s: wrong address returned for main\n", __FILE__);
result = 1;
diff --git a/dlfcn/defaultmod2.c b/dlfcn/defaultmod2.c
index c8615e2dc3..e0b170815c 100644
--- a/dlfcn/defaultmod2.c
+++ b/dlfcn/defaultmod2.c
@@ -16,9 +16,9 @@ found_in_mod2 (void)
}
-extern int test_in_mod2 (void *mainp);
+extern int test_in_mod2 (int (*mainp)(int, char **));
int
-test_in_mod2 (void *mainp)
+test_in_mod2 (int (*mainp)(int, char **))
{
int (*ifp) (void);
void *p;
@@ -31,7 +31,7 @@ test_in_mod2 (void *mainp)
printf ("%s: main not found\n", __FILE__);
result = 1;
}
- else if (p != mainp)
+ else if ((int (*)(int, char **))p != mainp)
{
printf ("%s: wrong address returned for main\n", __FILE__);
result = 1;