From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 7B59B3858D20; Thu, 25 Apr 2024 19:25:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B59B3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1714073157; bh=LiLBXCGXKd7EWt2Qx4MiTtW8FtfIzVSD2g+1z9j79pY=; h=From:To:Subject:Date:From; b=sJg3Abc0ADuX00WUp1FEInwO1gEJo85EfYZNUKVcPoIfLkWoeKz/JNYC9JwvZloRB MFsWBIPSCyaQpM5uDXqK5WkahM66qpaqbvp3Jvb1E5Kj30DDhM/jw0Iw7MNITU1wCy RMnvX7MpHVVH7++bStO902N0dXBfPQYOqAJHVZ0w= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-11373] Darwin: Correct a version check. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 9702d54788021b1f48a2fd1fe9f13607d37f491f X-Git-Newrev: dca9066e7deda6182b722ee4373f08909b8236d9 Message-Id: <20240425192557.7B59B3858D20@sourceware.org> Date: Thu, 25 Apr 2024 19:25:57 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dca9066e7deda6182b722ee4373f08909b8236d9 commit r11-11373-gdca9066e7deda6182b722ee4373f08909b8236d9 Author: Iain Sandoe Date: Mon Apr 1 20:47:25 2024 +0100 Darwin: Correct a version check. When the version for dsymutil comes from a clang build, it is of the form NNmm.pp.qq where NN and mm are the major and minor LLVM version components. We need to check for a major version greater than or equal to 7 - so use 700 in the check. gcc/ChangeLog: * config/darwin.c (darwin_override_options): Update the clang major version value in the dsymutil check. Signed-off-by: Iain Sandoe (cherry picked from commit 451bb0b9262d2f54173937569a29d7f1ad234e30) Diff: --- gcc/config/darwin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 0564e6f0218..574424ac11c 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -3369,7 +3369,7 @@ darwin_override_options (void) /* External toolchains based on LLVM or clang 7+ have support for dwarf-4. */ if ((dsymutil_version.kind == LLVM && dsymutil_version.major >= 7) - || (dsymutil_version.kind == CLANG && dsymutil_version.major >= 7)) + || (dsymutil_version.kind == CLANG && dsymutil_version.major >= 700)) dwarf_version = 4; else if (dsymutil_version.kind == DWARFUTILS && dsymutil_version.major >= 121)