diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
| commit | 8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5 (patch) | |
| tree | 196eec145dc3a6fb925a5b07d831b21d761d7c20 /stdlib | |
| parent | 48b752c9f6499f0de89766c94b3b1bedbfd6476e (diff) | |
Updated to fedora-glibc-20061029T2155cvs/fedora-glibc-2_5_90-3
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 4 | ||||
| -rw-r--r-- | stdlib/atexit.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index e632d3523b..a0ff427b7e 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -102,10 +102,6 @@ CFLAGS-strfmon.c = -D_IO_MTSAFE_IO CFLAGS-strfmon_l.c = -D_IO_MTSAFE_IO endif -ifeq (yes,$(have-protected)) -CFLAGS-atexit.c = -DHAVE_DOT_HIDDEN -endif - CFLAGS-tst-bsearch.c = $(stack-align-test-flags) CFLAGS-tst-qsort.c = $(stack-align-test-flags) diff --git a/stdlib/atexit.c b/stdlib/atexit.c index 307662bdcd..0575dda03b 100644 --- a/stdlib/atexit.c +++ b/stdlib/atexit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1999, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1999, 2001, 2006 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 @@ -43,14 +43,9 @@ extern void *__dso_handle __attribute__ ((__weak__)); /* Register FUNC to be executed by `exit'. */ int +attribute_hidden atexit (void (*func) (void)) { return __cxa_atexit ((void (*) (void *)) func, NULL, &__dso_handle == NULL ? NULL : __dso_handle); } - -/* Hide the symbol so that no definition but the one locally in the - executable or DSO is used. */ -#ifdef HAVE_DOT_HIDDEN -asm (".hidden\tatexit"); -#endif |