diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/alloc.c b/src/alloc.c index e557e82883c..1e0e5f58e84 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -209,10 +209,6 @@ enum { MALLOC_ALIGNMENT = max (2 * sizeof (size_t), alignof (long double)) }; | |||
| 209 | 209 | ||
| 210 | # define MMAP_MAX_AREAS 100000000 | 210 | # define MMAP_MAX_AREAS 100000000 |
| 211 | 211 | ||
| 212 | /* A pointer to the memory allocated that copies that static data | ||
| 213 | inside glibc's malloc. */ | ||
| 214 | static void *malloc_state_ptr; | ||
| 215 | |||
| 216 | /* Restore the dumped malloc state. Because malloc can be invoked | 212 | /* Restore the dumped malloc state. Because malloc can be invoked |
| 217 | even before main (e.g. by the dynamic linker), the dumped malloc | 213 | even before main (e.g. by the dynamic linker), the dumped malloc |
| 218 | state must be restored as early as possible using this special hook. */ | 214 | state must be restored as early as possible using this special hook. */ |
| @@ -247,10 +243,6 @@ malloc_initialize_hook (void) | |||
| 247 | break; | 243 | break; |
| 248 | } | 244 | } |
| 249 | } | 245 | } |
| 250 | |||
| 251 | if (malloc_set_state (malloc_state_ptr) != 0) | ||
| 252 | emacs_abort (); | ||
| 253 | alloc_unexec_post (); | ||
| 254 | } | 246 | } |
| 255 | } | 247 | } |
| 256 | 248 | ||
| @@ -266,27 +258,6 @@ voidfuncptr __MALLOC_HOOK_VOLATILE __malloc_initialize_hook EXTERNALLY_VISIBLE | |||
| 266 | #endif | 258 | #endif |
| 267 | 259 | ||
| 268 | #if defined DOUG_LEA_MALLOC | 260 | #if defined DOUG_LEA_MALLOC |
| 269 | |||
| 270 | /* Allocator-related actions to do just before and after unexec. */ | ||
| 271 | |||
| 272 | void | ||
| 273 | alloc_unexec_pre (void) | ||
| 274 | { | ||
| 275 | # ifdef DOUG_LEA_MALLOC | ||
| 276 | malloc_state_ptr = malloc_get_state (); | ||
| 277 | if (!malloc_state_ptr) | ||
| 278 | fatal ("malloc_get_state: %s", strerror (errno)); | ||
| 279 | # endif | ||
| 280 | } | ||
| 281 | |||
| 282 | void | ||
| 283 | alloc_unexec_post (void) | ||
| 284 | { | ||
| 285 | # ifdef DOUG_LEA_MALLOC | ||
| 286 | free (malloc_state_ptr); | ||
| 287 | # endif | ||
| 288 | } | ||
| 289 | |||
| 290 | # ifdef GNU_LINUX | 261 | # ifdef GNU_LINUX |
| 291 | 262 | ||
| 292 | /* The address where the heap starts. */ | 263 | /* The address where the heap starts. */ |