From nobody Fri Jun 30 16:44:05 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 4Qt1P16mT9z4kSgb; Fri, 30 Jun 2023 16:44:05 +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 4Qt1P16LYQz3R89; Fri, 30 Jun 2023 16:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688143445; 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=3ipAqQPvGhHoQ9ZJYix8Gh7OhFU0pkTtDqGbeRBuo9k=; b=ANUHThm0rQOZcq20FnXRNBjNqevudCX/khKoYEIJToz9iTroXZGrELYiyuhR/vBwWC/Inb PQvKybQ35kGl5VC5vRaRBPjUQ5wVUWaChf29XsZjKlEXji3DC1eLFFNX/HNRlLBRvHPcgB 1iEMkTLssYVwwtSCscTMrDgTA2CprTiqZmfYPWg4+faIIYA2Hwh0QUDroMrUj/qXdwET89 f04C1VLjto8hga2cMD1BovraDtVTW3jVJ0kYs3WaGCo9uAlDQUL6C5rrSfgTXvgCfPHj+S MZKFildUiXGG/5ls8k74auma/S0yCClKjxwVLcAy76OJ17dtAijYKbOzdT++9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688143445; 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=3ipAqQPvGhHoQ9ZJYix8Gh7OhFU0pkTtDqGbeRBuo9k=; b=ZEcO5s+by0UCYPQuSIaBV8GKBri5X2Qby0dT1JGa4P9kzEzM+wh3MCC/W42v9uxb566iKU k1TgebQbTLq0pxhKOBn9bJXNfl47zmusX5rAd+77vXlEfDPLJBF7Kh6cRtCvk0FVsQ5or5 ej8JUfaUpMzLE+7d0DUu3dpPvPd1JSIt9M4XTxWlb/ouy5njsnUovU5V1+Nm7QOLGwZVnX E+PyksHDQ9jRxIbz0gerq2pqSVLrr52rTuZI0ubBtkp/FTIgWxerHScRI3uUh1oF0oEsAr aL/iDVntblB9ZBjrsm0olwQBGSjj8X0qVNWBssgeDFMSCEA4PiYWB39dbh2Nvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688143445; a=rsa-sha256; cv=none; b=Fv/En5mhOpNAuJQiOHW4dgD8QfseUMXSHNM/nmteLgbtBXB1YWf0+Fof94jwZmtaBmjy7m kJ600Y+M6efC8g6g4YjmAPsvsPB0wjWwOIABAHucR5l9oUdMDbMCNa6sv3LGzryADkMydn 7d+o8/1mW5CZYip65cLqt+P4ndey2qbGuikVga3eFgqiZsYqYOqjbIg5LwAy4tAj6ndP04 xczYHxGu7kvU/h5zz8LLagfBtzrQyfAtHcw9RW6m6S4frIiKlBvwWGMz230OQwLb9CHYvK eTDmal71TjHzd9fWIjekymtADwaDV1O/2EYyJNz8OkOrEq9xxOoEHEQW5j38rQ== 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 4Qt1P15MRNz164d; Fri, 30 Jun 2023 16:44:05 +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 35UGi51T013326; Fri, 30 Jun 2023 16:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35UGi5gx013325; Fri, 30 Jun 2023 16:44:05 GMT (envelope-from git) Date: Fri, 30 Jun 2023 16:44:05 GMT Message-Id: <202306301644.35UGi5gx013325@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: f4de136aa829 - main - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4de136aa82978107aa98f91ca1928870b7d310a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f4de136aa82978107aa98f91ca1928870b7d310a commit f4de136aa82978107aa98f91ca1928870b7d310a Author: John Baldwin AuthorDate: 2023-06-30 16:36:16 +0000 Commit: John Baldwin CommitDate: 2023-06-30 16:43:58 +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. --- 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