git: de273c83a10c - main - linux(4): Fix i386 gcc build.

[Jessica Clarke]

On 26 Jul 2021, at 19:29, Dmitry Chagin <dchagin at FreeBSD.org> wrote:
> 
> 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

This just shifts the problem. You’ve fixed it if building an i386
kernel, but not if building an amd64 kernel with linux32 support.
This line should just be reverted and everything should work fine.

Jess