From nobody Fri Nov 11 18:36:41 2022 X-Original-To: dev-commits-src-branches@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 4N86qZ0sHhz4dbWl; Fri, 11 Nov 2022 18:36:42 +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 4N86qZ0B4jz3vZD; Fri, 11 Nov 2022 18:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668191802; 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=5xuy4W4H9ViNgbMs/N8I353iLbK5YNhmEmlMiLQuyq4=; b=YOYnevAJMeV+7imZoD9gBfmfJqiMkVQj8WsgvZp1QcUk3qDfCqV7X9Y+K/OLQlFt5Lo0th tHP5AlxWVF19iiV67y9cOMpQ0kcIMoZALMlqLuyKJgEgTuJcRbfsPcorlk3OgrC8+RvQfT G7J/E7URcIpr5s4Z6XADaw6HWIRlkX2QpfU/CaHkZ+jvRcXk55a2n8MsdbDCaGCKQakSm/ R5UBnGsPiSvqvW//AbzKOcOQz3WkxFufFJz0Yqpy5md2ohq/p4qVuQiYSfJddax2E0bCYv aIcXgISwCAp4XdXJQ8q14fv96VHeMsyVK0slru4wRqrxzaJJmXDgcO/U3SQetA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668191802; 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=5xuy4W4H9ViNgbMs/N8I353iLbK5YNhmEmlMiLQuyq4=; b=tc/F3YnLhrCEQ8O/pGIpZr8NXjW8iETtZVbh88adhpvDzzmWNRkniVCqo3OngyKRLDp1LQ ZE/9g9Xukjf9M3UOAJSZu8ant7OhDL2B76DW/eCzoyo/+EqoQ5MV28kAPjutuYpsZs9snI d6MjSrYynj+H5ORMidfC7KmUmHSw3OE2KPuqU7zTgrC2kJz1j2KSs8YC5JOcSa22LmN6IH fwqN4PX3jMv4133l9Qv/XTRtvHANGVzTE2t42sBY+lEry0MLGZp+VLgz7nX4em+WH448va o6uoPT8a70WIcrAm3yF83AUB5xNCB1DALEWnpWOvWvL+zOPdlTgxNPsdj0QFkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668191802; a=rsa-sha256; cv=none; b=OW2KsCFc55d6GIcOHt96kaX5Ww6duNuBAlUZYQ7mlF/S5+0alT9YqUvc1LiNdJ7gn0qzx4 4ZMhsoRZKctmStUTs42j9pAgO0t/xTqwMLN9aQy4nBIUpSJAsTLOVhW6H7WsGIolfonFiM aJuiB2rtwUTnPwZFv6EIkxCa/yDuQpK8JokAEgLqHvOG+BEblGGWtS0yOV8NdxlgHLy+s6 ktMZFm93sDrduuBcr03CjKFvFiKnx+4S2RUQ/8SYewDcz3Js34p+eI12Hmx9TV4xTqyz54 De572IFhRs6QHUsVFxalKl2P09vS8EhmJ0DCqDAv/xgDcg8FE/3g7XJ9mTGnAA== 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 4N86qY6LDlzt4y; Fri, 11 Nov 2022 18:36:41 +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 2ABIafJg003929; Fri, 11 Nov 2022 18:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABIaf6M003928; Fri, 11 Nov 2022 18:36:41 GMT (envelope-from git) Date: Fri, 11 Nov 2022 18:36:41 GMT Message-Id: <202211111836.2ABIaf6M003928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 20125b23ff15 - stable/13 - linux32: binutils as requires %eflags instead of %flags for CFI. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20125b23ff1532a61775c32e28bd78d9a8835737 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=20125b23ff1532a61775c32e28bd78d9a8835737 commit 20125b23ff1532a61775c32e28bd78d9a8835737 Author: John Baldwin AuthorDate: 2022-09-29 22:06:01 +0000 Commit: John Baldwin CommitDate: 2022-11-11 18:18:53 +0000 linux32: binutils as requires %eflags instead of %flags for CFI. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D36781 (cherry picked from commit a35572b16e38420f5f7573b13bfe2c3b07a79d19) --- sys/amd64/linux32/linux32_locore.asm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/amd64/linux32/linux32_locore.asm b/sys/amd64/linux32/linux32_locore.asm index f4cdc5fc1559..bf1158185a1f 100644 --- a/sys/amd64/linux32/linux32_locore.asm +++ b/sys/amd64/linux32/linux32_locore.asm @@ -24,7 +24,11 @@ ENTRY(linux32_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 @@ -56,7 +60,11 @@ ENTRY(linux32_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