From patchwork Tue Apr 2 11:26:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1918745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ejMdozwB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V85Ds4kXLz1yYw for ; Tue, 2 Apr 2024 22:26:37 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B43B6385840A for ; Tue, 2 Apr 2024 11:26:34 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id B093E3858CDB for ; Tue, 2 Apr 2024 11:26:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B093E3858CDB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B093E3858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::336 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712057171; cv=none; b=xHPItXciAyO1UV8BInnAzB7xZeFS5U/DT9NXZ4vTSZj1L3RKpuOw3X9Rh0Qq7mkkWMfBZlOGB9H0jSlnYEK4rCH2e5eFZr0VQTqaKEP9EE7nvqte7gzc0mA7Dmxg0bO3dw9BnyidzlLwHXQ04VPOicyAsmrkMeAmBzP9XfD9fK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712057171; c=relaxed/simple; bh=US5pIzl2XLfDXpNuaz3zoR6ZAgCUuL8kqcP55oDH0vc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=uZQEL1k6VgEsue4UK8HZjAKH5cJA/FNBBczIjPfKx0FRJ4cvlQWSFN/LejTccl+Iw1mWH6Nv+VQNxo80VOLWl783Jn1Zu8NVigUUbM1WD3z+Xu+by+Q8S5mfWPMgFHIqadTieonY/bny6DWuDuUaK40WkNkkSFAXgbnfo/kaCAU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4161c24bad0so2791045e9.0 for ; Tue, 02 Apr 2024 04:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712057168; x=1712661968; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=utFhqUe1GFKGT6TvXdi2god5MpXLlklG/dPm7kvgTQc=; b=ejMdozwBZ4IkXMeBXzOSR40coEHNSf9ucDeLZxIeq0tx5B2D8COAq54NQlSSXSIds5 hZ02OnI9irY3Vn6DMaGO8twX9stafbtwy/r8kWQjTLbvDwGb4HxKmc7tUjJZlWAi6gMa QbRRhcPzuieYoZIcUYZAbFwGP7RR9TunqYFtQ/+uX/nUPbPDrHf/PycZS+SFi85kurJz dpJ4qwM8nsnMm8n+E1dPb6kKlkJaK0WMKptAp/fN77r+c6gbXpO+S9DkEAOSDrCwwTAV g8bCNYMydLqFnDtbbG6Qj8oqT6xlqM6ft5QjgFpUXM/LxTvC6Z1bpr24ZsZTIp+2c9oP AIeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712057168; x=1712661968; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=utFhqUe1GFKGT6TvXdi2god5MpXLlklG/dPm7kvgTQc=; b=qdXHlMTVQUdXo+k6pWcWYg1JFQN3spqQhzr6oPaSs2FJ+ke6Rh4/9Aq1FSq8UQI/w/ f/f0vA/F06JD1PXT5M4qUnGdfXQAXsAR14UQoy8PRzhqrp3FSdbQmEQ/sb5GBtiZBwaM 408kzG9Wivz+v48xrfIfhbyLKIC77S5AfJptG8cHE43+D5zG0LmoGb3+j54Dz+w5RvFs 6zvALE+eHczP87bRHNPs7eS4etj/yn3wsznCVKszP8C0MwP5yPSvnnAjqDsQgM9LztE+ /N3TXAQRKmgvVucRIsFx2ROiXFywt+6WEbvVP5QniObbM2jI19+FDmJjwLJFy5Od7abK JP6A== X-Gm-Message-State: AOJu0YzJfCV1zq2evPsJou58Yw3oVshxbAVOx/q9K27XqDb2dY5IZo5J CHf5kuFAry72dEyjAq4hlM5HSRnV14zy2o+wR+sq5TqRQeI/u3cPxFBcCPNj X-Google-Smtp-Source: AGHT+IGe8S9//wu8QREUo3Gv/9zgzX5RgxDBhBiRtEKtR5zHxDl0IBuOh0ja8i6f30483Fn2yAC6FA== X-Received: by 2002:a05:600c:1393:b0:414:e738:d02a with SMTP id u19-20020a05600c139300b00414e738d02amr8962694wmf.32.1712057168226; Tue, 02 Apr 2024 04:26:08 -0700 (PDT) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id i5-20020a05600c354500b00414924f307csm17669406wmq.26.2024.04.02.04.26.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 04:26:07 -0700 (PDT) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [pushed] Darwin: Correct a version check. Date: Tue, 2 Apr 2024 12:26:07 +0100 Message-Id: <20240402112607.86615-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-darwin17,21,23, pushed to trunk, thanks, Iain --- 8< --- 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 --- 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 c37a1a4756f..63b8c509405 100644 --- a/gcc/config/darwin.cc +++ b/gcc/config/darwin.cc @@ -3420,7 +3420,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)