diff options
| author | Paul Eggert | 2019-02-01 13:03:18 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-02-01 13:05:39 -0800 |
| commit | 3b69e02a248c8b46223d5a9cecfb2494992e5fbe (patch) | |
| tree | 22eca8d283fb1ea9aef90f5529260803e95dc266 /src/alloc.c | |
| parent | 84802b66197c623735aaca875b8e1a39cb0ef085 (diff) | |
| download | emacs-3b69e02a248c8b46223d5a9cecfb2494992e5fbe.tar.gz emacs-3b69e02a248c8b46223d5a9cecfb2494992e5fbe.zip | |
Rename CANNOT_DUMP to HAVE_UNEXEC
* configure.ac (CANNOT_DUMP): Remove. All uses removed,
or changed to the negative of with_unexec.
(HAVE_UNEXEC): New macro. All uses of CANNOT_DUMP changed
to the negative of this macro.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/alloc.c b/src/alloc.c index 5ea466becae..a0d0a611346 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -168,7 +168,7 @@ voidfuncptr __MALLOC_HOOK_VOLATILE __malloc_initialize_hook EXTERNALLY_VISIBLE | |||
| 168 | 168 | ||
| 169 | #endif | 169 | #endif |
| 170 | 170 | ||
| 171 | #if defined DOUG_LEA_MALLOC || !defined CANNOT_DUMP | 171 | #if defined DOUG_LEA_MALLOC || defined HAVE_UNEXEC |
| 172 | 172 | ||
| 173 | /* Allocator-related actions to do just before and after unexec. */ | 173 | /* Allocator-related actions to do just before and after unexec. */ |
| 174 | 174 | ||
| @@ -502,11 +502,11 @@ static struct mem_node *mem_find (void *); | |||
| 502 | #endif | 502 | #endif |
| 503 | 503 | ||
| 504 | /* Addresses of staticpro'd variables. Initialize it to a nonzero | 504 | /* Addresses of staticpro'd variables. Initialize it to a nonzero |
| 505 | value if we might dump; otherwise some compilers put it into | 505 | value if we might unexec; otherwise some compilers put it into |
| 506 | BSS. */ | 506 | BSS. */ |
| 507 | 507 | ||
| 508 | Lisp_Object *staticvec[NSTATICS] | 508 | Lisp_Object *staticvec[NSTATICS] |
| 509 | #ifndef CANNOT_DUMP | 509 | #ifdef HAVE_UNEXEC |
| 510 | = {&Vpurify_flag} | 510 | = {&Vpurify_flag} |
| 511 | #endif | 511 | #endif |
| 512 | ; | 512 | ; |
| @@ -1192,9 +1192,9 @@ verify (POWER_OF_2 (BLOCK_ALIGN)); | |||
| 1192 | 1192 | ||
| 1193 | /* Use aligned_alloc if it or a simple substitute is available. | 1193 | /* Use aligned_alloc if it or a simple substitute is available. |
| 1194 | Aligned allocation is incompatible with unexmacosx.c, so don't use | 1194 | Aligned allocation is incompatible with unexmacosx.c, so don't use |
| 1195 | it on Darwin unless CANNOT_DUMP. */ | 1195 | it on Darwin if HAVE_UNEXEC. */ |
| 1196 | 1196 | ||
| 1197 | #if !defined DARWIN_OS || defined CANNOT_DUMP | 1197 | #if ! (defined DARWIN_OS && defined HAVE_UNEXEC) |
| 1198 | # if (defined HAVE_ALIGNED_ALLOC \ | 1198 | # if (defined HAVE_ALIGNED_ALLOC \ |
| 1199 | || (defined HYBRID_MALLOC \ | 1199 | || (defined HYBRID_MALLOC \ |
| 1200 | ? defined HAVE_POSIX_MEMALIGN \ | 1200 | ? defined HAVE_POSIX_MEMALIGN \ |
| @@ -5390,7 +5390,7 @@ pure_alloc (size_t size, int type) | |||
| 5390 | } | 5390 | } |
| 5391 | 5391 | ||
| 5392 | 5392 | ||
| 5393 | #ifndef CANNOT_DUMP | 5393 | #ifdef HAVE_UNEXEC |
| 5394 | 5394 | ||
| 5395 | /* Print a warning if PURESIZE is too small. */ | 5395 | /* Print a warning if PURESIZE is too small. */ |
| 5396 | 5396 | ||