about summary refs log tree commit diff
path: root/dlfcn/default.c
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/default.c
parent1ee598e6cd5225d53eddddb382a5403e045f9e70 (diff)
downloadglibc-d57a3f0e0219dec6406f3477fe2eee21054c7e9c.tar.gz
glibc-d57a3f0e0219dec6406f3477fe2eee21054c7e9c.tar.xz
glibc-d57a3f0e0219dec6406f3477fe2eee21054c7e9c.zip
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/default.c')
-rw-r--r--dlfcn/default.c6
1 files changed, 3 insertions, 3 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;
 }