public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Iain D Sandoe <iains@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r11-11373] Darwin: Correct a version check.
Date: Thu, 25 Apr 2024 19:25:57 +0000 (GMT)	[thread overview]
Message-ID: <20240425192557.7B59B3858D20@sourceware.org> (raw)

https://gcc.gnu.org/g:dca9066e7deda6182b722ee4373f08909b8236d9

commit r11-11373-gdca9066e7deda6182b722ee4373f08909b8236d9
Author: Iain Sandoe <iain@sandoe.co.uk>
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 <iain@sandoe.co.uk>
    (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)

                 reply	other threads:[~2024-04-25 19:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240425192557.7B59B3858D20@sourceware.org \
    --to=iains@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).