The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eca818c872f7ad094f8dac143123e7e8d65f3bcc
commit eca818c872f7ad094f8dac143123e7e8d65f3bcc Author: Warner Losh <[email protected]> AuthorDate: 2022-10-24 18:11:50 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2022-10-24 18:13:03 +0000 stand/efi: Simpler construct Use 'sizeof(long) == 8' for a compile time constant that can be used as an initializer rather than #ifdefs. Sponsored by: Netflix --- stand/efi/loader/bootinfo.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 38175bf10bc5..afa24c127276 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -316,7 +316,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) vm_offset_t size; char *rootdevname; int howto; - bool is64; + bool is64 = sizeof(long) == 8; #if defined(LOADER_FDT_SUPPORT) vm_offset_t dtbp; int dtb_size; @@ -336,12 +336,6 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif }; #endif -#ifdef __LP64__ - is64 = true; -#else - is64 = false; -#endif - howto = bi_getboothowto(args); /*
