Changeset View
Changeset View
Standalone View
Standalone View
sys/boot/efi/boot1/Makefile
| Show All 9 Lines | |||||
| INTERNALPROG= | INTERNALPROG= | ||||
| WARNS?= 3 | WARNS?= 3 | ||||
| # Include bcache code. | # Include bcache code. | ||||
| HAVE_BCACHE= yes | HAVE_BCACHE= yes | ||||
| .if ${MK_ZFS} != "no" | .if ${MK_ZFS} != "no" | ||||
| # Disable warnings that are currently incompatible with the zfs boot code | # Disable warnings that are currently incompatible with the zfs boot code | ||||
| CWARNFLAGS.boot1.c += -Wno-missing-variable-declarations | CWARNFLAGS.boot1.c += -Wno-missing-variable-declarations | ||||
lifanov: This block now appears twice. | |||||
| CWARNFLAGS.zfs.c += -Wno-incompatible-pointer-types-discards-qualifiers | CWARNFLAGS.zfs.c += -Wno-incompatible-pointer-types-discards-qualifiers | ||||
| CWARNFLAGS.zfs.c += -Wno-missing-variable-declarations | CWARNFLAGS.zfs.c += -Wno-missing-variable-declarations | ||||
| CWARNFLAGS.zfs.c += -Wno-array-bounds | CWARNFLAGS.zfs.c += -Wno-array-bounds | ||||
| CWARNFLAGS.zfs.c += -Wno-cast-align | CWARNFLAGS.zfs.c += -Wno-cast-align | ||||
| CWARNFLAGS.zfs.c += -Wno-cast-qual | CWARNFLAGS.zfs.c += -Wno-cast-qual | ||||
| CWARNFLAGS.zfs.c += -Wno-missing-prototypes | CWARNFLAGS.zfs.c += -Wno-missing-prototypes | ||||
| CWARNFLAGS.zfs.c += -Wno-sign-compare | CWARNFLAGS.zfs.c += -Wno-sign-compare | ||||
| CWARNFLAGS.zfs.c += -Wno-unused-parameter | CWARNFLAGS.zfs.c += -Wno-unused-parameter | ||||
| Show All 29 Lines | |||||
| .PATH: ${.CURDIR}/arch/${MACHINE} | .PATH: ${.CURDIR}/arch/${MACHINE} | ||||
| CFLAGS+= -I. | CFLAGS+= -I. | ||||
| CFLAGS+= -I${.CURDIR}/../include | CFLAGS+= -I${.CURDIR}/../include | ||||
| CFLAGS+= -I${.CURDIR}/../include/${MACHINE} | CFLAGS+= -I${.CURDIR}/../include/${MACHINE} | ||||
| CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include | CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include | ||||
| CFLAGS+= -I${.CURDIR}/../../.. | CFLAGS+= -I${.CURDIR}/../../.. | ||||
| CFLAGS+= -I${.CURDIR}/../../boot_crypto | |||||
impUnsubmitted Not Done Inline ActionsThis needs to be updated to use BOOTDIR imp: This needs to be updated to use BOOTDIR | |||||
| CFLAGS+= -DEFI_UFS_BOOT | CFLAGS+= -DEFI_UFS_BOOT | ||||
| .ifdef(EFI_DEBUG) | .ifdef(EFI_DEBUG) | ||||
| CFLAGS+= -DEFI_DEBUG | CFLAGS+= -DEFI_DEBUG | ||||
| .endif | .endif | ||||
| .if ${MK_ZFS} != "no" | .if ${MK_ZFS} != "no" | ||||
| CFLAGS+= -I${.CURDIR}/../../zfs/ | CFLAGS+= -I${.CURDIR}/../../zfs/ | ||||
| CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/ | CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/ | ||||
| Show All 27 Lines | |||||
| .if ${MACHINE_CPUARCH} == "aarch64" | .if ${MACHINE_CPUARCH} == "aarch64" | ||||
| CFLAGS+= -mgeneral-regs-only | CFLAGS+= -mgeneral-regs-only | ||||
| .endif | .endif | ||||
| .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" | .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" | ||||
| CFLAGS+= -fPIC | CFLAGS+= -fPIC | ||||
| LDFLAGS+= -Wl,-znocombreloc | LDFLAGS+= -Wl,-znocombreloc | ||||
| .endif | .endif | ||||
| LIBBOOT_CRYPTO= ${.OBJDIR}/../../boot_crypto/libboot_crypto.a | |||||
impUnsubmitted Not Done Inline ActionsMove this to defs.mk and use ${OBJTOP}/sys/boot/boot_crypto/libboot_crytpo.a imp: Move this to defs.mk and use ${OBJTOP}/sys/boot/boot_crypto/libboot_crytpo.a | |||||
| # | # | ||||
| # Add libstand for the runtime functions used by the compiler - for example | # Add libstand for the runtime functions used by the compiler - for example | ||||
| # __aeabi_* (arm) or __divdi3 (i386). | # __aeabi_* (arm) or __divdi3 (i386). | ||||
| # as well as required string and memory functions for all platforms. | # as well as required string and memory functions for all platforms. | ||||
| # | # | ||||
| DPADD+= ${LIBEFI} ${LIBSTAND} | DPADD+= ${LIBEFI} ${LIBSTAND} ${LIBBOOT_CRYPTO} | ||||
| LDADD+= ${LIBEFI} ${LIBSTAND} | LDADD+= ${LIBEFI} ${LIBSTAND} ${LIBBOOT_CRYPTO} | ||||
impUnsubmitted Not Done Inline ActionsGenerally, LIBSTAND should be last. And this patch needs to be reworked to use the new LIBSA that I just committed. imp: Generally, LIBSTAND should be last. And this patch needs to be reworked to use the new LIBSA… | |||||
| DPADD+= ${LDSCRIPT} | DPADD+= ${LDSCRIPT} | ||||
| NM?= nm | NM?= nm | ||||
| OBJCOPY?= objcopy | OBJCOPY?= objcopy | ||||
| .if ${MACHINE_CPUARCH} == "amd64" | .if ${MACHINE_CPUARCH} == "amd64" | ||||
| EFI_TARGET= efi-app-x86_64 | EFI_TARGET= efi-app-x86_64 | ||||
| ▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines | |||||
This block now appears twice.