diff options
| author | Warner Losh <imp@FreeBSD.org> | 2024-02-25 00:57:21 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-04-16 19:54:28 +0000 |
| commit | 36d49fb2d58501facfd219f0b5bb260c9986b53d (patch) | |
| tree | a874841c1389f7053fb4aae1be15c4b37406a030 | |
| parent | 88ec6ce7d15915d53f68b9930b7f2cbb791d227f (diff) | |
loader/ficl: Rename the ficl compile set to X4th_compile_set
And upcoming change will need this set to be named this. Since it's only
used in the efi Makefile, and inside if ficl itself, the change should
be a nop.
Sponsored by: Netflix
Reviewed by: tsoome, kevans
Differential Revision: https://reviews.freebsd.org/D44063
(cherry picked from commit 8ec8413faa3573c579d9e6361de904f8251b0c0e)
| -rw-r--r-- | stand/efi/loader/Makefile | 2 | ||||
| -rw-r--r-- | stand/ficl/ficl.h | 4 | ||||
| -rw-r--r-- | stand/ficl/loader.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index bb95b6480646..b8a98fc1dd47 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG} ${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 index bdade26eee09..7be78f1a36b8 100644 --- a/stand/ficl/ficl.h +++ b/stand/ficl/ficl.h @@ -1153,8 +1153,8 @@ typedef struct ficlFILE 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 index 618d9483fbd9..69a65ebedb73 100644 --- a/stand/ficl/loader.c +++ b/stand/ficl/loader.c @@ -865,7 +865,7 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys) 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__) |