From ec88bbd1bfaedf5f6adbe968dddde178c54a2b43 Mon Sep 17 00:00:00 2001
From: Vibhav Pant <vibhavp@gmail.com>
Date: Tue, 20 Dec 2022 21:25:28 +0530
Subject: [PATCH] Correctly build builtin syms string while hashing abi.

* src/comp.c (hash_native_abi) [HAVE_STATIC_LISP_GLOBALS]: Avoid a
spurious ' ' at the end of builtin_syms while concatenating builtin
symbols.
---
 src/comp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/comp.c b/src/comp.c
index d20fca4336f..2f90d6c54be 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1051,10 +1051,13 @@ hash_native_abi (void)
   Lisp_Object builtin_syms = Qnil;
   AUTO_STRING (sep, " ");
 
-  for (ptrdiff_t i = 0; i < ARRAYELTS (lispsym); i++)
+  for (ptrdiff_t i = 0; i < ARRAYELTS (lispsym) - 1; i++)
     builtin_syms
       = concat3 (builtin_syms, SYMBOL_NAME (builtin_lisp_symbol (i)),
-                 sep);
+		 sep);
+  builtin_syms
+    = concat2 (builtin_syms, SYMBOL_NAME (builtin_lisp_symbol (
+			       ARRAYELTS (lispsym) - 1)));
 #endif
 
   Vcomp_abi_hash = comp_hash_string (