diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | NEWS | 16 | ||||
| -rw-r--r-- | malloc/malloc.h | 83 |
3 files changed, 56 insertions, 46 deletions
diff --git a/ChangeLog b/ChangeLog index efa978eb26..5fb62a630b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-05-29 Ulrich Drepper <drepper@gmail.com> + [BZ #11781] + * malloc/malloc.h: Declare malloc hook variables as volatile. + * locale/programs/locarchive.c (add_locale_to_archive): Fix typo in last patch. diff --git a/NEWS b/NEWS index 7640467dec..f95fcd2bea 100644 --- a/NEWS +++ b/NEWS @@ -10,14 +10,14 @@ Version 2.14 * The following bugs are resolved with this release: 386, 6420, 7101, 9730, 9732, 9809, 10138, 10149, 10157, 11257, 11258, - 11487, 11532, 11578, 11653, 11668, 11697, 11724, 11799, 11820, 11837, - 11857, 11869, 11892, 11895, 11901, 11945, 11947, 11952, 11987, 12052, - 12083, 12158, 12178, 12200, 12346, 12393, 12420, 12432, 12445, 12449, - 12453, 12454, 12460, 12469, 12489, 12509, 12510, 12511, 12518, 12527, - 12541, 12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625, - 12626, 12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, 12711, - 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, - 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814 + 11487, 11532, 11578, 11653, 11668, 11697, 11724, 11781, 11799, 11820, + 11837, 11857, 11869, 11892, 11895, 11901, 11945, 11947, 11952, 11987, + 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420, 12432, 12445, + 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510, 12511, 12518, + 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, + 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, + 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, + 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814 * The RPC implementation in libc is obsoleted. Old programs keep working but new programs cannot be linked with the routines in libc anymore. diff --git a/malloc/malloc.h b/malloc/malloc.h index d0aedc0cdf..2bdece0b49 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -1,5 +1,5 @@ /* Prototypes and definition for malloc implementation. - Copyright (C) 1996, 1997, 1999, 2000, 2002-2004, 2005, 2007, 2009 + Copyright (C) 1996, 1997, 1999, 2000, 2002-2004, 2005, 2007, 2009, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -37,10 +37,17 @@ functions. */ # define __MALLOC_PMT(args) args +# ifdef _LIBC +# define __MALLOC_HOOK_VOLATILE +# else +# define __MALLOC_HOOK_VOLATILE +# endif + #else /* Not GCC. */ # define __MALLOC_P(args) args # define __MALLOC_PMT(args) args +# define __MALLOC_HOOK_VOLATILE #endif /* GCC. */ @@ -48,50 +55,49 @@ __BEGIN_DECLS /* Allocate SIZE bytes of memory. */ -extern void *malloc __MALLOC_P ((size_t __size)) __attribute_malloc__ __wur; +extern void *malloc (size_t __size) __THROW __attribute_malloc__ __wur; /* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */ -extern void *calloc __MALLOC_P ((size_t __nmemb, size_t __size)) - __attribute_malloc__ __wur; +extern void *calloc (size_t __nmemb, size_t __size) + __THROW __attribute_malloc__ __wur; /* Re-allocate the previously allocated block in __ptr, making the new block SIZE bytes long. */ /* __attribute_malloc__ is not used, because if realloc returns the same pointer that was passed to it, aliasing needs to be allowed between objects pointed by the old and new pointers. */ -extern void *realloc __MALLOC_P ((void *__ptr, size_t __size)) - __attribute_warn_unused_result__; +extern void *realloc (void *__ptr, size_t __size) + __THROW __attribute_warn_unused_result__; /* Free a block allocated by `malloc', `realloc' or `calloc'. */ -extern void free __MALLOC_P ((void *__ptr)); +extern void free (void *__ptr) __THROW; /* Free a block allocated by `calloc'. */ -extern void cfree __MALLOC_P ((void *__ptr)); +extern void cfree (void *__ptr) __THROW; /* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ -extern void *memalign __MALLOC_P ((size_t __alignment, size_t __size)) - __attribute_malloc__ __wur; +extern void *memalign (size_t __alignment, size_t __size) + __THROW __attribute_malloc__ __wur; /* Allocate SIZE bytes on a page boundary. */ -extern void *valloc __MALLOC_P ((size_t __size)) - __attribute_malloc__ __wur; +extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur; /* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up __size to nearest pagesize. */ -extern void * pvalloc __MALLOC_P ((size_t __size)) - __attribute_malloc__ __wur; +extern void * pvalloc (size_t __size) __THROW __attribute_malloc__ __wur; /* Underlying allocation function; successive calls should return contiguous pieces of memory. */ -extern void *(*__morecore) __MALLOC_PMT ((ptrdiff_t __size)); +extern void *(*__morecore) (ptrdiff_t __size); /* Default value of `__morecore'. */ -extern void *__default_morecore __MALLOC_P ((ptrdiff_t __size)) - __attribute_malloc__; +extern void *__default_morecore (ptrdiff_t __size) + __THROW __attribute_malloc__; /* SVID2/XPG mallinfo structure */ -struct mallinfo { +struct mallinfo +{ int arena; /* non-mmapped space allocated from system */ int ordblks; /* number of free chunks */ int smblks; /* number of fastbin blocks */ @@ -105,7 +111,7 @@ struct mallinfo { }; /* Returns a copy of the updated current mallinfo. */ -extern struct mallinfo mallinfo __MALLOC_P ((void)); +extern struct mallinfo mallinfo (void) __THROW; /* SVID2/XPG mallopt options */ #ifndef M_MXFAST @@ -132,47 +138,48 @@ extern struct mallinfo mallinfo __MALLOC_P ((void)); #define M_ARENA_MAX -8 /* General SVID/XPG interface to tunable parameters. */ -extern int mallopt __MALLOC_P ((int __param, int __val)); +extern int mallopt (int __param, int __val) __THROW; /* Release all but __pad bytes of freed top-most memory back to the system. Return 1 if successful, else 0. */ -extern int malloc_trim __MALLOC_P ((size_t __pad)); +extern int malloc_trim (size_t __pad) __THROW; /* Report the number of usable allocated bytes associated with allocated chunk __ptr. */ -extern size_t malloc_usable_size __MALLOC_P ((void *__ptr)); +extern size_t malloc_usable_size (void *__ptr) __THROW; /* Prints brief summary statistics on stderr. */ -extern void malloc_stats __MALLOC_P ((void)); +extern void malloc_stats (void) __THROW; /* Output information about state of allocator to stream FP. */ -extern int malloc_info (int __options, FILE *__fp); +extern int malloc_info (int __options, FILE *__fp) __THROW; /* Record the state of all malloc variables in an opaque data structure. */ -extern void *malloc_get_state __MALLOC_P ((void)); +extern void *malloc_get_state (void) __THROW; /* Restore the state of all malloc variables from data obtained with malloc_get_state(). */ -extern int malloc_set_state __MALLOC_P ((void *__ptr)); +extern int malloc_set_state (void *__ptr) __THROW; /* Called once when malloc is initialized; redefining this variable in the application provides the preferred way to set up the hook pointers. */ -extern void (*__malloc_initialize_hook) __MALLOC_PMT ((void)); +extern void (*__malloc_initialize_hook) (void); /* Hooks for debugging and user-defined versions. */ -extern void (*__free_hook) __MALLOC_PMT ((void *__ptr, - __const __malloc_ptr_t)); -extern void *(*__malloc_hook) __MALLOC_PMT ((size_t __size, - __const __malloc_ptr_t)); -extern void *(*__realloc_hook) __MALLOC_PMT ((void *__ptr, size_t __size, - __const __malloc_ptr_t)); -extern void *(*__memalign_hook) __MALLOC_PMT ((size_t __alignment, - size_t __size, - __const __malloc_ptr_t)); -extern void (*__after_morecore_hook) __MALLOC_PMT ((void)); +extern void (*__MALLOC_HOOK_VOLATILE __free_hook) (void *__ptr, + __const __malloc_ptr_t); +extern void *(*__MALLOC_HOOK_VOLATILE __malloc_hook) (size_t __size, + __const __malloc_ptr_t); +extern void *(*__MALLOC_HOOK_VOLATILE __realloc_hook) (void *__ptr, + size_t __size, + __const __malloc_ptr_t); +extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook) (size_t __alignment, + size_t __size, + __const __malloc_ptr_t); +extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); /* Activate a standard set of debugging hooks. */ -extern void __malloc_check_init __MALLOC_P ((void)); +extern void __malloc_check_init (void) __THROW; __END_DECLS |