[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/no-purespace 76330ffd560 01/11: Fixup: remove from "Pure storage
From: |
Pip Cet |
Subject: |
scratch/no-purespace 76330ffd560 01/11: Fixup: remove from "Pure storage removal: Main part" |
Date: |
Wed, 21 Aug 2024 05:57:04 -0400 (EDT) |
branch: scratch/no-purespace
commit 76330ffd560655ecad0459c2e50edb8a4527fb3f
Author: Pip Cet <pipcet@protonmail.com>
Commit: Pip Cet <pipcet@protonmail.com>
Fixup: remove from "Pure storage removal: Main part"
This section was incorrectly included in commit "Pure storage removal:
Main part", but belongs in commit "Unexec removal: Main part".
Remove this line from the commit message for "Pure storage removal: Main
part":
(mmap_lisp_allowed_p): Remove unexec-specific code.
---
src/alloc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/alloc.c b/src/alloc.c
index ffe68392c03..86ab0f89fc7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -586,8 +586,10 @@ mmap_lisp_allowed_p (void)
{
/* If we can't store all memory addresses in our lisp objects, it's
risky to let the heap use mmap and give us addresses from all
- over our address space. */
- return pointers_fit_in_lispobj_p ();
+ over our address space. We also can't use mmap for lisp objects
+ if we might dump: unexec doesn't preserve the contents of mmapped
+ regions. */
+ return pointers_fit_in_lispobj_p () && !will_dump_with_unexec_p ();
}
#endif
- scratch/no-purespace updated (1e8513ee38e -> 2bf9a47aa7b), Pip Cet, 2024/08/21
- scratch/no-purespace a0ae37e68c3 03/11: Handle obsolete :purecopy keyword better in Fmake_hash_table, Pip Cet, 2024/08/21
- scratch/no-purespace d119fd3084a 04/11: Fixup for "Pure storage removal: Remove purecopy hash table flag", Pip Cet, 2024/08/21
- scratch/no-purespace e80868ced1b 02/11: Fixup for "Unexec removal: Main part", Pip Cet, 2024/08/21
- scratch/no-purespace 093fd31413b 07/11: Don't recognize "bootstrap" option for --temacs, Pip Cet, 2024/08/21
- scratch/no-purespace f118b3dbd47 08/11: Unexec removal: Documentation adjustments, Pip Cet, 2024/08/21
- scratch/no-purespace f1cd3b5c503 09/11: Unexec removal: Build system, Pip Cet, 2024/08/21
- scratch/no-purespace 78b5d9f6848 05/11: Fixup for "Pure storage removal: Replace calls to removed functions", Pip Cet, 2024/08/21
- scratch/no-purespace 2fecbfca337 10/11: Fixup for "Unexec removal: Main part", Pip Cet, 2024/08/21
- scratch/no-purespace 76330ffd560 01/11: Fixup: remove from "Pure storage removal: Main part",
Pip Cet <=
- scratch/no-purespace 8c6f7f16839 06/11: Pure storage removal: Documentation, Pip Cet, 2024/08/21
- scratch/no-purespace 2bf9a47aa7b 11/11: Fixup for "Pure storage removal: Main part"., Pip Cet, 2024/08/21