c18n: Add a temporary workaround for ubiq-c18n not being present.

CTSRD-CHERI · Mar 27, 2024 · 2a35164 · 2a35164
1 parent b6fb884
commit 2a35164
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/libexec/rtld-elf/rtld_c18n.c b/libexec/rtld-elf/rtld_c18n.c
@@ -864,21 +864,25 @@ struct jmp_args _rtld_unw_setcontext_epilogue(struct jmp_args ret, void *rcsp,
 struct jmp_args
 _rtld_unw_setcontext(struct jmp_args ret, void *rcsp, void **buf)
 {
+#ifdef C18N_ENABLED
 	if (!C18N_ENABLED) {
-		__attribute__((musttail)) return (
-		    _rtld_unw_setcontext_epilogue(ret, rcsp, buf));
+		__attribute__((musttail))
+		return (_rtld_unw_setcontext_epilogue(ret, rcsp, buf));
 	}
+#endif
 	return (unwind_stack(ret, rcsp, cheri_unseal(*buf, sealer_unwbuf),
 	    get_trusted_frame()));
 }
 
 struct jmp_args
 _rtld_unw_setcontext_unsealed(struct jmp_args ret, void *rcsp, void **buf)
 {
+#ifdef C18N_ENABLED
 	if (!C18N_ENABLED) {
-		__attribute__((musttail)) return (
-		    _rtld_unw_setcontext_epilogue(ret, rcsp, buf));
+		__attribute__((musttail))
+		return (_rtld_unw_setcontext_epilogue(ret, rcsp, buf));
 	}
+#endif
 	return (unwind_stack(ret, rcsp, *buf, get_trusted_frame()));
 }