From nobody Thu Sep 29 22:07:44 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 4MdnXw3JDwz4YHWF; Thu, 29 Sep 2022 22:07:44 +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 4MdnXw2kzbz3PPF; Thu, 29 Sep 2022 22:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664489264; 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=O0FfvzVEHE6duSI4hF6SNowfNKwdB2ikZyzAiMT/490=; b=TlpbW8lAjAbntrXicOxlBCiXNXFYD7UHRehGPJZCCtNw0J7uFg/JAoUrnGNWQYQM0gSQ9H 72tSJGCX/+V6+P1m/tn2sAVOeD/LcO1cvByjIfxRykd8N1+wZhTuU5FilJoISPzM0ht3b1 rvn7a+ZILtQ75Txk/D2eoFumTWxOw35ZOOU5GqL2bBhOtwHJhCjhxhNh3ai44PrNyGGAJ2 WpAGHQP4FRX9Ez7DiO5D0+q6DM2prvHdPJKi3El0QdqGB3fMejjx2rkIu8/lhXsYMm+TCU nzesdtjHDfqMnvcq5rpqBDGjQY2cKFX8ROIDbW9EM7M2+NEskyjK8ycWp9h9Xw== 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 4MdnXw1bQvzxj1; Thu, 29 Sep 2022 22:07:44 +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 28TM7iwQ003024; Thu, 29 Sep 2022 22:07:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TM7iZ4003023; Thu, 29 Sep 2022 22:07:44 GMT (envelope-from git) Date: Thu, 29 Sep 2022 22:07:44 GMT Message-Id: <202209292207.28TM7iZ4003023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a35572b16e38 - main - linux32: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a35572b16e38420f5f7573b13bfe2c3b07a79d19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664489264; 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=O0FfvzVEHE6duSI4hF6SNowfNKwdB2ikZyzAiMT/490=; b=J6OqwKUbugZIn2dbosOLROHn8YYNfLLRHvKNArhgFn+G4cFsDfI4fDBhNrkbjKRQAI3rCT zcoKP8X+io9ElcId0LfaYyeUq4BTonapR2ZcidsvhILj7aYjqw6rHYe4cFpIsQhCl2uxy0 572v4ovqE8UhwbeeAYEFxnX/oNmWvd10B7dst+NhYT+vdUwcaVCyYIAZzh7wbUHTRoEHrR cNATtO/C+6pLlTOnmdp64AHU0qq8IaSU1GN/F0i64UdNM4CsDIszYGJEwtGjq0GXSuam8a ZJfEiCj5u4PYB+8tuK/fmXjZa+bEYzeQvWd6OCqpKDI4wv6pweJpxYvzgSpPhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664489264; a=rsa-sha256; cv=none; b=uwVeR3VAlEy4L+s/kFsTA5TEm1AwuuhL7gz8XUOtLuYtHZf+k7Cj80T/SORUwdf8wUP9OC fp8/fO+aTa18C8VfP8a+DfSIwd9HwGZWTbKze0GF5J4gtDwOD1Q3ARGgYfrEfFMyVI2Glm bGDXMsHcT6qHrjCzEPu+9sGbxsD/EiA/wGk8qurjLp9PxLTWjyPWWgeEVR9CIKMLhrqWFL l7+jAKI2+tCHmoh+jZM7vmbris+pqn6GRQAkGacvdXGDMPBtZzYXDxe0RdOsCkGmUtASgT StMPtxlG3Y9hvrd2+OKADCfj4/3RefqJLL9MEQvgfWkuebzEZAHOQ1WZY4tVCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a35572b16e38420f5f7573b13bfe2c3b07a79d19 commit a35572b16e38420f5f7573b13bfe2c3b07a79d19 Author: John Baldwin AuthorDate: 2022-09-29 22:06:01 +0000 Commit: John Baldwin CommitDate: 2022-09-29 22:06:01 +0000 linux32: binutils as requires %eflags instead of %flags for CFI. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D36781 --- 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