git: de273c83a10c - main - linux(4): Fix i386 gcc build.
Dmitry Chagin
dchagin at FreeBSD.org
Mon Jul 26 18:29:44 UTC 2021
The branch main has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=de273c83a10c5807b52b7479e477854b77baa912
commit de273c83a10c5807b52b7479e477854b77baa912
Author: Dmitry Chagin <dchagin at FreeBSD.org>
AuthorDate: 2021-07-26 18:28:16 +0000
Commit: Dmitry Chagin <dchagin at FreeBSD.org>
CommitDate: 2021-07-26 18:28:16 +0000
linux(4): Fix i386 gcc build.
Do not specify memory model for i386. Seems that clang silencly
ignores -mcmodel unlike gcc.
Reported by: jhb
MFC after: 2 weeks
---
sys/modules/linux/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 1304c2d91fd8..bf4449e0012e 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -60,20 +60,20 @@ linux${SFX}_assym.h: linux${SFX}_genassym.o
sh ${SYSDIR}/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
.if ${MACHINE_CPUARCH} == "amd64"
-VDSOFLAGS=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 -m32
+VDSOFLAGS=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 -m32 -mcmodel=small
.endif
linux${SFX}_locore.o: linux${SFX}_assym.h assym.inc
${CC} -c -x assembler-with-cpp -DLOCORE -fPIC -pipe -O2 -Werror \
-msoft-float -mregparm=0 \
- -mcmodel=small -fno-common -nostdinc -fasynchronous-unwind-tables \
+ -fno-common -nostdinc -fasynchronous-unwind-tables \
-fno-omit-frame-pointer -foptimize-sibling-calls ${VDSOFLAGS} \
-fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \
${.IMPSRC} -o ${.TARGET}
linux${SFX}_vdso_gtod.o: linux_vdso_gtod.inc ${VDSODEPS}
${CC} -c -fPIC -pipe -O2 -Werror -msoft-float -mregparm=0 \
- -mcmodel=small -fno-common -nostdinc -fasynchronous-unwind-tables \
+ -fno-common -nostdinc -fasynchronous-unwind-tables \
-fno-omit-frame-pointer -foptimize-sibling-calls ${VDSOFLAGS} \
-fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \
${.IMPSRC} -o ${.TARGET}
More information about the dev-commits-src-all
mailing list