From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id F24BD3858CDA; Mon, 22 Apr 2024 18:48:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F24BD3858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713811724; bh=1w8OW17MkeKe68o1BPc4n5n2tMPCCePWLoeFpT5aqQU=; h=From:To:Subject:Date:From; b=hOWTRLYEiehzPtRJceMQ5/s3zX0UWuseyiC9I5JtweKVdUjKjrqMSq8jaiWwE6RnQ kwFzeQXHYbMFfHfZ0lot6gXzhFHaMgaWyvXyQC4/KEU1tUu1JYLzk13RxCyW0cU5t7 yJvVerIEXHfPMhACrlcD0CPfv+ebor5oEy9yQrT0= 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 r12-10382] Darwin: Correct a version check. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: f6b8bd94ff853ac321c72cc80968d8386023b7e5 X-Git-Newrev: 13ae931863dcc3684742ed81ce84d005fbec1bb7 Message-Id: <20240422184844.F24BD3858CDA@sourceware.org> Date: Mon, 22 Apr 2024 18:48:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:13ae931863dcc3684742ed81ce84d005fbec1bb7 commit r12-10382-g13ae931863dcc3684742ed81ce84d005fbec1bb7 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.cc (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.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/config/darwin.cc b/gcc/config/darwin.cc index 6153f3c39fe..76feb87a29d 100644 --- a/gcc/config/darwin.cc +++ b/gcc/config/darwin.cc @@ -3381,7 +3381,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)