D48715.id150532.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48715.id150532.diff
View Options

	diff --git a/sys/arm64/arm64/efirt_support.S b/sys/arm64/arm64/efirt_support.S
	--- a/sys/arm64/arm64/efirt_support.S
	+++ b/sys/arm64/arm64/efirt_support.S
	@@ -85,7 +85,7 @@
	ret
	END(efi_rt_arch_call)

	-ENTRY(efi_rt_fault)
	+LENTRY(efi_rt_fault)
	/* Clear pcb_onfault */
	SET_FAULT_HANDLER(xzr, x11)
	/* Load curthread */
	@@ -96,6 +96,6 @@
	/* Normal exit returning an error */
	ldr x0, =EFAULT
	b .Lefi_rt_arch_call_exit
	-END(efi_rt_fault)
	+LEND(efi_rt_fault)

	GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)
	diff --git a/sys/modules/efirt/Makefile b/sys/modules/efirt/Makefile
	--- a/sys/modules/efirt/Makefile
	+++ b/sys/modules/efirt/Makefile
	@@ -4,16 +4,17 @@
	KMOD= efirt
	SRCS= efirt.c efirt_machdep.c efidev.c
	SRCS+= efirtc.c
	+SRCS+= efirt_support.S
	SRCS+= device_if.h bus_if.h clock_if.h
	+DPSRCS+= assym.inc

	.if ${MACHINE_CPUARCH} == "amd64"
	SRCS+= opt_hwpmc_hooks.h opt_kstack_pages.h
	-SRCS+= efirt_support.S
	-DPSRCS+= assym.inc
	+.endif
	+
	efirt_support.o: efirt_support.S assym.inc
	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
	${.IMPSRC} -o ${.TARGET}
	-.endif

	EXPORT_SYMS= YES