From: Andrea Corallo <acorallo@gnu.org>
Date: Wed, 18 Dec 2024 20:55:41 +0000 (+0100)
Subject: Use '--lambda-fixup' as native compiler fixup symbol for lambdas
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbbfe88bb6f58b3d812c33cfb1d6d878c8fd9147;p=emacs.git

Use '--lambda-fixup' as native compiler fixup symbol for lambdas

* src/comp.c (check_comp_unit_relocs, syms_of_comp): Rename
'Qlambda_fixup' to 'Q__lambda_fixup'.
* src/pdumper.c (dump_do_dump_relocation): Likewise.

(cherry picked from commit 9e99c43d2f5dc5dc2632ad616d224f3bd9cf63c4)
---

diff --git a/src/comp.c b/src/comp.c
index 6f67d60cc26..7f31f3652a1 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5157,7 +5157,7 @@ check_comp_unit_relocs (struct Lisp_Native_Comp_Unit *comp_u)
   for (ptrdiff_t i = 0; i < d_vec_len; i++)
     {
       Lisp_Object x = data_relocs[i];
-      if (EQ (x, Qlambda_fixup))
+      if (EQ (x, Q__lambda_fixup))
 	return false;
       else if (NATIVE_COMP_FUNCTIONP (x))
 	{
@@ -5610,7 +5610,7 @@ natively-compiled one.  */);
   DEFSYM (Qfixnum, "fixnum");
   DEFSYM (Qscratch, "scratch");
   DEFSYM (Qlate, "late");
-  DEFSYM (Qlambda_fixup, "lambda-fixup");
+  DEFSYM (Q__lambda_fixup, "--lambda-fixup");
   DEFSYM (Qgccjit, "gccjit");
   DEFSYM (Qcomp_subr_trampoline_install, "comp-subr-trampoline-install");
   DEFSYM (Qnative_comp_warning_on_missing_source,
diff --git a/src/pdumper.c b/src/pdumper.c
index aa02c464802..4240bb86b58 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5463,7 +5463,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
 	    XSETSUBR (tem, subr);
 	    Lisp_Object *fixup =
 	      &(comp_u->data_relocs[XFIXNUM (lambda_data_idx)]);
-	    eassert (EQ (*fixup, Qlambda_fixup));
+	    eassert (EQ (*fixup, Q__lambda_fixup));
 	    *fixup = tem;
 	    Fputhash (tem, Qt, comp_u->lambda_gc_guard_h);
 	  }