From nobody Fri Jun 17 19:37:15 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 78BD785A6DD; Fri, 17 Jun 2022 19:37:16 +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 4LPq7J01nyz3PSv; Fri, 17 Jun 2022 19:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494636; 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=16HL55tjaPKVRRNiiV3cJHLf2BGcFcjfRabAdS5+cfs=; b=W86ZzaCQmvo3vMgGZgRYiAzCAa9gR6flK69PDu4pz5tA4TpNQZlMfG57OWH48b95HgB5A5 8UGZUSjmP0bgkBkdEPPMDpelcdG4GtE8KtxKrD8hBQ8ia4uQZxCWI8uIVAuXtfKCaUrYjz fOQU/SVg5yuigwz8yVB0WGds8l370F5dwwDX3x9SU4d5V1WuAlKS0mBWpdgPj4YfqiKrdE 21UMFgln/ip+xYuSPMnHlCgjqF93lijmkE8MZNVLM3RSb9VrlTg3Xk6rWrJ5iJLZYmtZKz Vacg0NHRiXI3wZ1ESieQFIioNtmEtnRFJEh2LDu6zY+1gkUHqQn38acYA2yYYQ== 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 702F525C35; Fri, 17 Jun 2022 19:37:15 +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 25HJbFhg013113; Fri, 17 Jun 2022 19:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbFJg013112; Fri, 17 Jun 2022 19:37:15 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:15 GMT Message-Id: <202206171937.25HJbFJg013112@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: 274667c1ee5c - stable/13 - linux(4): Fix amd64 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: 274667c1ee5c24a6ebb22a8ee44e759098a2fd93 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494636; 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=16HL55tjaPKVRRNiiV3cJHLf2BGcFcjfRabAdS5+cfs=; b=xXUP+gpvJyA6A9Z7ok1gnjDH0+v/neiBuSpUaZibRBDaAYhI4oEbeX3Op61k3pJResAYOe 2ugB/IfC3Xufm0MGqEbvA2e+D9pqz6efBhlmWhjopIGJcahW43H6uyWrZ9wE0YDEjYObRN ZJB8Mycz778JN8AawIupfg5tS29a7ATeyfpZR5vl12+f9TVmOTRS9Dzue5X5jnoRkndhG0 l3xDixWFcyEHgp1aAek9gX1XNu7Z+Sy2xm8WMkNoVJj/7OAc/R2guPG+9hYWvXh6kWHmCz UJx8k5VqEDkYKd3hU1g+2eU/gaqk6aeK1Gllesrl7H0SdZ1JIPGk9zi2wlfjiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494636; a=rsa-sha256; cv=none; b=mcIol4uQKpjSO9qgETDZihugkTu/HKHrK/NLYPDmcI76pjv+1wKJvN93FGiZtc9hisw1EM vM905VZihIGNV1sTduVGqEaWAtUnChiM5XHIdvhq56eQ5nj5hbs4fuPbLPd+5/0Sk6fXkz LXqy432g08KL0v0p6a1Zs4zHHNh1BqvrvrO+sOiaEn8bWhojo/IySpXSbDdpjiDhkbQdIQ LlnAk2JrYsqQ1AUgsYPXcoLm+dVF4AnSxrsX8gSdiXAO4sWDRnOAnhOuhNNfC0m2Z04B+8 fxenhzjfNftR6gnsa566yPSGU0UP29iZqrX6jM1uiWMhSjzq8RkI5tvNTtMvcg== 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=274667c1ee5c24a6ebb22a8ee44e759098a2fd93 commit 274667c1ee5c24a6ebb22a8ee44e759098a2fd93 Author: Dmitry Chagin AuthorDate: 2021-07-26 19:28:21 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:14 +0000 linux(4): Fix amd64 gcc build. Do not specify memory model and mregparm for amd64, it's only available on IA-32 architecture. Reported by: jhb, jrtc27 MFC after: 2 weeks (cherry picked from commit b0fa09a0a7e30f301cc58750dedb3d88ec39992d) --- sys/modules/linux/Makefile | 8 +++++--- sys/modules/linux64/Makefile | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index e552e9ce6302..a0d48297e542 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -60,19 +60,21 @@ 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 -mcmodel=small +VDSOFLAGS=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 -m32 +.else +VDSOFLAGS=-mregparm=0 .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 \ + -msoft-float \ -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 \ + ${CC} -c -fPIC -pipe -O2 -Werror -msoft-float \ -fno-common -nostdinc -fasynchronous-unwind-tables \ -fno-omit-frame-pointer -foptimize-sibling-calls ${VDSOFLAGS} \ -fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \ diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 0764d1b0dc99..e2a408f49bad 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -31,7 +31,7 @@ linux_assym.h: linux_genassym.o sh ${SYSDIR}/kern/genassym.sh linux_genassym.o > ${.TARGET} .if ${MACHINE_CPUARCH} == "amd64" -VDSOFLAGS=-mregparm=0 -mcmodel=small -msoft-float +VDSOFLAGS=-mcmodel=small -msoft-float VDSODEPS=linux_vdso_gettc_x86.inc .elif ${MACHINE_CPUARCH} == "aarch64" # The Linux uses tiny memory model, but our ld does not know about