upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-27 09:06:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce the number of attempts to detect proper kld format for the amd64

Browse source 
loader.
This commit is contained in:
Andrey V. Elsukov 2012-09-30 12:24:15 +00:00
parent 93f01327ea
commit 95b2c05cf0
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/boot/i386/loader/Makefile
View file

@ -125,6 +125,7 @@ LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
.if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine
CLEANFILES+= machine
CFLAGS+= -DLOADER_PREFER_AMD64
machine:
ln -sf ${.CURDIR}/../../../i386/include machine
.endif

10
sys/boot/i386/loader/conf.c
View file

@ -109,10 +109,16 @@ extern struct file_format amd64_elf;
extern struct file_format amd64_elf_obj;
struct file_format *file_formats[] = {
&i386_elf,
&i386_elf_obj,
#ifdef LOADER_PREFER_AMD64
&amd64_elf,
&amd64_elf_obj,
#endif
&i386_elf,
&i386_elf_obj,
#ifndef LOADER_PREFER_AMD64
&amd64_elf,
&amd64_elf_obj,
#endif
NULL
};