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 6f67d60cc26e8d4ccfd6af188e08f8d32f12dcf6..7f31f3652a1fe8da7a34f54d83765214db8d2e73 100644 (file)
--- 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 aa02c464802c2a5b34be9e1020bcdfa9fab7bc3f..4240bb86b588596a0b08f39f0c990b76a2868059 100644 (file)
--- 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);
          }