D44063.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D44063.diff
View Options

	diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
	--- a/stand/efi/loader/Makefile
	+++ b/stand/efi/loader/Makefile
	@@ -117,7 +117,7 @@
	${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \
	-j .dynamic -j .dynsym -j .rel.dyn \
	-j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
	- -j set_Xficl_compile_set -j set_Xlua_compile_set \
	+ -j set_X4th_compile_set -j set_Xlua_compile_set \
	--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}

	LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a
	diff --git a/stand/ficl/ficl.h b/stand/ficl/ficl.h
	--- a/stand/ficl/ficl.h
	+++ b/stand/ficl/ficl.h
	@@ -1153,8 +1153,8 @@

	typedef void ficlCompileFcn(FICL_SYSTEM *);
	#define FICL_COMPILE_SET(func) \
	- DATA_SET(Xficl_compile_set, func)
	-SET_DECLARE(Xficl_compile_set, ficlCompileFcn);
	+ DATA_SET(X4th_compile_set, func)
	+SET_DECLARE(X4th_compile_set, ficlCompileFcn);

	#ifdef LOADER_VERIEXEC
	#include <verify_file.h>
	diff --git a/stand/ficl/loader.c b/stand/ficl/loader.c
	--- a/stand/ficl/loader.c
	+++ b/stand/ficl/loader.c
	@@ -865,7 +865,7 @@
	dictAppendWord(dp, "uuid-from-string", ficlUuidFromString, FW_DEFAULT);
	dictAppendWord(dp, "uuid-to-string", ficlUuidToString, FW_DEFAULT);

	- SET_FOREACH(fnpp, Xficl_compile_set)
	+ SET_FOREACH(fnpp, X4th_compile_set)
	(*fnpp)(pSys);

	#if defined(__i386__)