From nobody Fri Aug 11 10:09:01 2023 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 4RMfdn67dQz4pqhS; Fri, 11 Aug 2023 10:09:01 +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 4RMfdn5bwgz3Vvk; Fri, 11 Aug 2023 10:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691748541; 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=Gn+IvT9oVs8JJ/qM1ZAmMu3rGx4fH9/rSytQPegdp5c=; b=IV6IscloiOTjoEtf+AThurPqQiovUCr0uoYzlKlkQhDcvPsTh52l2T4+dwQPD9tb12uTdn I+2niKsXIFwYaMuCtx34X2IyYs74TatHGDVWgpN6ULZZYLsuLLVdCujRxdwFRsaf6mtJIN 28wXWS/UhptAaPvNMwyynYis1Ckwr2OFS0wqn7kBX3qP0jvC8ZfBGYgXUsDuaVHdxutk8y xtcLIq4vQFlrpGBon6wSZoGCLC+VGJTyaLrWqKZaUjSV/ss+UWzt3dSg1o2N731rP6pDaj 1seIsDIMV2glWM7jFOftgpxtMAv2LVJYOxn/nBrZf7JO0H9aJMVFeTtXXjXAOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691748541; 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=Gn+IvT9oVs8JJ/qM1ZAmMu3rGx4fH9/rSytQPegdp5c=; b=FJ6m1VjFSDtybHvZVI105vOmJADg21GFrIMHWV2NKIb5R6GLMR28eXIK30Q9mGBwQja579 8/qg+2Rh2rbmK3WdRatxnuYTAYojncXkW8cy9g7ov2fOwmejfQzLSJKbMe4F8xhfGH+zoj rdyEUUel0HTmPtYqfdGc1a+HWcuZ9ggCw5d+4L6mL21WKgF7OSM+ZypfsyVLHSeaU2CRpq ZoCEvrcNEOxi3e0ZOSkW6j/7S92Xe0jKJ8iImkb+JBa4GrBseOQUOYPZuErUIe1m0CfJbo cP6Mo6BGWib6CbNOLNtXNOG3R/t4CC/EMBeBtaqPy5OvSK+yUjuETRt14yUj3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691748541; a=rsa-sha256; cv=none; b=c5vC5QiGQ7sKqA8t/9lKZFGDhhZjmFFZx+ZbIz5pfjR1faCTNh2tmZBeutu70tlkNffAbu 81Ge9UiFx02CtwOEBJpIAvuxnTqHgA4FndjLAQe77pqe/59/nyYVHwJi6KcQr6KqG+6LRV jAR2MIojOerV6kpPUnJjCxB2+BjgdADdg4iiJwCQ1fNKRmWe53BiMkndPoi1/xjdsbgBDE 4lssU2oC3g+/5sw9foXPvmyO7tt7/TjyF6EPGv3fZi4ZPdz1LU2l2ZpF22cXtOMXiwQwLT vEtVMy9CImbKd+8dwXX1DyB4K5RY6CTxKC1J2cjfokAkYYC+lml539S9r6+uig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RMfdn4fsvzb8N; Fri, 11 Aug 2023 10:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BA91uV093773; Fri, 11 Aug 2023 10:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BA91SR093770; Fri, 11 Aug 2023 10:09:01 GMT (envelope-from git) Date: Fri, 11 Aug 2023 10:09:01 GMT Message-Id: <202308111009.37BA91SR093770@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: 455b78443ee5 - stable/13 - linux: binutils as requires %eflags instead of %flags for CFI. 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: 455b78443ee5612557f3f076c6d27c79de9ec1e7 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=455b78443ee5612557f3f076c6d27c79de9ec1e7 commit 455b78443ee5612557f3f076c6d27c79de9ec1e7 Author: John Baldwin AuthorDate: 2023-06-30 16:36:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-11 10:08:10 +0000 linux: binutils as requires %eflags instead of %flags for CFI. This applies the changes to linux32_locore.asm from commit a35572b16e38 to the i386 copy. (cherry picked from commit f4de136aa82978107aa98f91ca1928870b7d310a) --- sys/i386/linux/linux_locore.asm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm index 9aef5ad21d26..bebd05686149 100644 --- a/sys/i386/linux/linux_locore.asm +++ b/sys/i386/linux/linux_locore.asm @@ -23,7 +23,11 @@ ENTRY(linux_vdso_sigcode) .cfi_offset %ds, L_SC_DS .cfi_offset %cs, L_SC_CS .cfi_offset %ss, L_SC_SS +#ifdef __clang__ .cfi_offset %flags, L_SC_EFLAGS +#else + .cfi_offset %eflags, L_SC_EFLAGS +#endif .cfi_offset %edi, L_SC_EDI .cfi_offset %esi, L_SC_ESI .cfi_offset %ebp, L_SC_EBP @@ -54,7 +58,11 @@ ENTRY(linux_vdso_rt_sigcode) .cfi_offset %ds, L_SC_DS .cfi_offset %cs, L_SC_CS .cfi_offset %ss, L_SC_SS +#ifdef __clang__ .cfi_offset %flags, L_SC_EFLAGS +#else + .cfi_offset %eflags, L_SC_EFLAGS +#endif .cfi_offset %edi, L_SC_EDI .cfi_offset %esi, L_SC_ESI .cfi_offset %ebp, L_SC_EBP