diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bb_init_func.c | 6 | ||||
| -rw-r--r-- | sysdeps/generic/libc-start.c | 8 | ||||
| -rw-r--r-- | sysdeps/generic/mknod.c | 9 |
3 files changed, 16 insertions, 7 deletions
diff --git a/sysdeps/generic/bb_init_func.c b/sysdeps/generic/bb_init_func.c index 0560493a37..b872fc12b1 100644 --- a/sysdeps/generic/bb_init_func.c +++ b/sysdeps/generic/bb_init_func.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@cs.arizona.edu). @@ -47,6 +47,8 @@ __bb_init_func (struct __bb *bb) { /* we didn't register _mcleanup yet and pc profiling doesn't seem to be active, so let's register it now: */ - atexit (_mcleanup); + extern void *__dso_handle __attribute__ ((__weak__)); + __cxa_atexit ((void (*) (void *)) _mcleanup, NULL, + &__dso_handle ? __dso_handle : NULL); } } diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index fa394b45f2..b651d73603 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -92,7 +92,7 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **), # ifdef HAVE_AUX_VECTOR for (auxvec = (void *__unbounded *__unbounded) ubp_ev; - *auxvec; auxvec++); + *auxvec != NULL; ++auxvec); ++auxvec; _dl_aux_init ((ElfW(auxv_t) *) auxvec); # endif @@ -100,7 +100,7 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **), /* Register the destructor of the dynamic linker if there is any. */ if (__builtin_expect (rtld_fini != NULL, 1)) - atexit (rtld_fini); + __cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL); /* Call the initializer of the libc. This is only needed here if we are compiling for the static library in which case we haven't @@ -111,7 +111,7 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **), /* Register the destructor of the program, if any. */ if (fini) - atexit (fini); + __cxa_atexit ((void (*) (void *)) fini, NULL, NULL); /* Call the initializer of the program, if any. */ #ifdef SHARED diff --git a/sysdeps/generic/mknod.c b/sysdeps/generic/mknod.c index 8d1dde2546..56530c5d8d 100644 --- a/sysdeps/generic/mknod.c +++ b/sysdeps/generic/mknod.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,3 +45,10 @@ __mknod (const char *path, mode_t mode, dev_t dev) } weak_alias (__mknod, mknod) + +/* Hide the symbol so that no definition but the one locally in the + executable or DSO is used. */ +#ifdef HAVE_DOT_HIDDEN +asm (".hidden\tmknod"); +asm (".hidden\t__mknod"); +#endif |