git: 35548e48a41e - main - linux64: improve linux_support.s make rules
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Nov 2022 15:37:56 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=35548e48a41e292f373ed5773d9fb802ec263c92
commit 35548e48a41e292f373ed5773d9fb802ec263c92
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-07-19 20:42:27 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-11-02 15:37:43 +0000
linux64: improve linux_support.s make rules
Previously we relied on the .s.o rule in share/mk/bsd.suffixes.mk to
tell make that linux_support.o is built from linux_support.s, even
though we do not use the .s.o rule to assemble it.
Reviewed by: sjg
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D35864
---
sys/modules/linux/Makefile | 4 ++--
sys/modules/linux64/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index f761459d2bd9..ac5b30b19265 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -132,9 +132,9 @@ linux${SFX}_vdso.so: linux${SFX}_vdso.so.o
${STRIPBIN} -N _binary_linux${SFX}_vdso_so_o_size ${.TARGET}
.if ${MACHINE_CPUARCH} == "amd64"
-linux${SFX}_support.o: linux${SFX}_assym.h assym.inc
+linux${SFX}_support.o: linux${SFX}_support.S linux${SFX}_assym.h assym.inc
${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
- ${.IMPSRC} -o ${.TARGET}
+ ${.ALLSRC:M*.S:u} -o ${.TARGET}
.endif
linux${SFX}_genassym.o: offset.inc
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index f6f750e5216d..7d9929f7e14b 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -98,9 +98,9 @@ linux_vdso.so: linux_vdso.so.o
linux_vdso.so.o ${.TARGET}
${STRIPBIN} -N _binary_linux_vdso_so_o_size ${.TARGET}
-linux_support.o: assym.inc linux_assym.h
+linux_support.o: linux_support.S assym.inc linux_assym.h
${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
- ${.IMPSRC} -o ${.TARGET}
+ ${.ALLSRC:M*.S:u} -o ${.TARGET}
linux_genassym.o: offset.inc
${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}