emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 4b3ccf3092e: Unbreak the unexec build


From: Eli Zaretskii
Subject: master 4b3ccf3092e: Unbreak the unexec build
Date: Sat, 4 Mar 2023 10:02:07 -0500 (EST)

branch: master
commit 4b3ccf3092eaf5573b0f4968ee9a4515d04fd061
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Unbreak the unexec build
    
    * src/alloc.c (BLOCK_ALIGN) [HAVE_UNEXEC]: Reset back to 1024.
    (Bug#61960)
---
 src/alloc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/alloc.c b/src/alloc.c
index 5450586b533..d09fc41dec6 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1083,7 +1083,11 @@ lisp_free (void *block)
    BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary.  */
 
 /* Byte alignment of storage blocks.  */
-#define BLOCK_ALIGN (1 << 15)
+#ifdef HAVE_UNEXEC
+# define BLOCK_ALIGN (1 << 10)
+#else  /* !HAVE_UNEXEC */
+# define BLOCK_ALIGN (1 << 15)
+#endif
 verify (POWER_OF_2 (BLOCK_ALIGN));
 
 /* Use aligned_alloc if it or a simple substitute is available.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]