From nobody Fri Jun 17 19:37:14 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7B02985A644; Fri, 17 Jun 2022 19:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPq7G5rXFz3PL6; Fri, 17 Jun 2022 19:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOfiq89nC6bhRl2eBV2eNBMAeRQM8p9EBDOw63mb4vE=; b=vsBmsnClHxfFVkekvFMAFZ3fzfPta35i1L1e/T510QbDg+vTijWw44jEYC5e0hNMxr0IYG 4RDzkoEbnDsqRwQMeAmm3HICw2ALfcxtP/v9y8YfEJPAwTxVFlnvyJlD/lXkNDKTHkJv0u I5Z3XfCAtVl9J1xqDog4O2dGp/FdAvCmwo6ii+eH8mobigLHLOhFTRRu4W35mxMrKU+Jah WZ+aAqtc6Id6GVsFmfzGLaoWJoCabOYHeg3p6CleM1+DhNZgioioSyP/Yo5vn51VhIEZD8 tkdOvHlAEFrQs+H1ASZDaodlcgPuJbMrOrnm+k/3zB4eWmMp9kVta7hjhUehbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FDB025C34; Fri, 17 Jun 2022 19:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJbE3N013083; Fri, 17 Jun 2022 19:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbEFw013082; Fri, 17 Jun 2022 19:37:14 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:14 GMT Message-Id: <202206171937.25HJbEFw013082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 2cb3d5ae1e5d - stable/13 - linux(4): Fix i386 gcc build. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2cb3d5ae1e5dde1e7fadbae81eb020f640e6eb26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOfiq89nC6bhRl2eBV2eNBMAeRQM8p9EBDOw63mb4vE=; b=fqeDl+4EdTTOe5I5FzZP9eoH2J6K2S4vdSVWtB9AH0XQ1hiNKGSsxXvEJ/uJts1BfgLUTK Elm+XY9qb0dskYWsDcGiTu+mW4KCFV3P9l0XkpVo+cXxLe2nCc4UourRuSIxhNiDayLYM2 quQTtHyoEWMVfF6F33aBy3eNw9WaRJvsHoXxqgGijIm3xHFn4am4BdPAa6mwpVQcp5jU23 VYqwvc1z2ZKROtHmLFw2RhLMi+8A1LwQ5Pd1DpCJWyicngcha0mEnKV/TrstRebq0fLthB 8kBkeSTiZ2wX6M+xW5qteG64WXgQxjzCnOPrnbxiiEQQonSNF8S2fyqQlbVCcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494634; a=rsa-sha256; cv=none; b=o41TREjP+zhGUke/kkqJMVbSXaxdhY4GGTJzBKPHrLWC51cQRWrgUegy1Qm4e0mYFiuHvR DzUekcJ189rxtCQsTwmkKW8eASqr4od/itaLa4bmV4iH5FX6PyADyHWrgYUcOP1ewYyARq ggf+go79z2FVAjTeFwW59pJ7rOmNfIOrEJWekwG9rRTU56iISOCGmsYtlL1CLRfh09xQL8 7WcySdK3ZMl6DGjZ8e86qiLy1DhRdEHcSpFkYediGzqdNmJtEvfLwzhMQi3jog0DJXHRNb lqYW3OzD6PLT/Olg5Qt2wn8aIgj16maF+y6Vns6JJGGXUvG/t+qGQILYyJGT6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2cb3d5ae1e5dde1e7fadbae81eb020f640e6eb26 commit 2cb3d5ae1e5dde1e7fadbae81eb020f640e6eb26 Author: Dmitry Chagin AuthorDate: 2021-07-26 18:28:16 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:13 +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 (cherry picked from commit de273c83a10c5807b52b7479e477854b77baa912) --- 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 6b5c3b9b8612..e552e9ce6302 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}