From patchwork Tue Feb 13 23:22:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1898537 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=quicinc.com header.i=@quicinc.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=mM0pePyr; 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 4TZHSH3G3Hz23hY for ; Wed, 14 Feb 2024 10:23:11 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DE3B3857BAC for ; Tue, 13 Feb 2024 23:23:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by sourceware.org (Postfix) with ESMTPS id 65C223857B98 for ; Tue, 13 Feb 2024 23:22:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 65C223857B98 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 65C223857B98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707866568; cv=none; b=pHGl4aCWnB80EskrxV1zhsZliAAxzMB4OXaZ6k6rnpo+fR2f6BGFUHKCp+LFgnnVrX6MHOLwau5kSqj7hcEePlDpr/Li2nD9/6kEzvs+T5q+7F9qvNeeO+BAn+Yqd61sonHUwrcgKqBOmfCxTK+5M8ug3kukJp+EoArVoL78NPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707866568; c=relaxed/simple; bh=K9NvKIgy+LqveuPO97EYl8itRwveYzJoaj3QOWNzKF0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AdbdrCi0E3tNj98JJUL8/njtZTjPSxrkpeNCkjpKMKK+UmqyL8ffn1NFoIZ7wNr4I59UJYOmypdiOvkMXkfGmiaYA6OAzVwMcVy/HVO6c5cSqRB0m2HdzxSd6lj16RDvVdZIIOafHV8VzF0FZgz/NiBtkJZ6BgiY+XTB6qXfWa8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41DNLe8s002367 for ; Tue, 13 Feb 2024 23:22:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=qcppdkim1; bh=72spaZ8 m5842wYfogUmIR0BpJ+OWoq5Sor95zAnbiSM=; b=mM0pePyrweYvFtg/LVzL0SS mbt0qJVDy7/5St+ZDyug+KcQZghlBLXDXPdCrSep+tqQsq7XzkAy7bGbcSBn8UCo I6JIsnEiKxhhCR7UCpOLZlqhkCqflhylngPQT4/L78owebGdRMdNbb8H9/jAmGZQ 7cL4tQSHnBJl029YmsfMjfOLoqvgYMfqzjKB/GhgkZ0ORyxEJocLrGNHorAd7tW0 FdatfHZep+fr5iD9xa3DEJd9zpVcpRn5wFyFNfqIl2nuhknIya0CUkPGTg5YLmiT 0MD1cH44uJ2YNnv9CipV+7nIcliZFDb5cAojLqtCN0mVlVot95iUPyGfjwAT6zA= = Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3w7gse46px-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Feb 2024 23:22:45 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41DNMiAF032289 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Feb 2024 23:22:44 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Tue, 13 Feb 2024 15:22:44 -0800 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] aarch64: Reword error message for mismatch guard size and probing interval [PR90155] Date: Tue, 13 Feb 2024 15:22:32 -0800 Message-ID: <20240213232232.26225-1-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: qh3R2l5d94u8xxWfwQf7DdtFGmX6_p90 X-Proofpoint-ORIG-GUID: qh3R2l5d94u8xxWfwQf7DdtFGmX6_p90 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-13_15,2024-02-12_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 adultscore=0 spamscore=0 clxscore=1015 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402130183 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org The error message is not clear what options are being taked about when it says the values need to match; plus there is a wrong quotation dealing with the diagnostic. So this changes the error message to be exactly talking about the param options that are being taked about and now with the options, it needs the quoting. OK? Built and tested for aarch64-linux-gnu. gcc/ChangeLog: * config/aarch64/aarch64.cc (aarch64_override_options_internal): Fix error message for mismatch guard size and probing interval. Signed-off-by: Andrew Pinski --- gcc/config/aarch64/aarch64.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 32eae49d4e9..2da743469ae 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -18334,7 +18334,7 @@ aarch64_override_options_internal (struct gcc_options *opts) "size. Given value %d (%llu KB) is out of range", guard_size, (1ULL << guard_size) / 1024ULL); - /* Enforce that interval is the same size as size so the mid-end does the + /* Enforce that interval is the same size as size so the middle-end does the right thing. */ SET_OPTION_IF_UNSET (opts, &global_options_set, param_stack_clash_protection_probe_interval, @@ -18346,8 +18346,8 @@ aarch64_override_options_internal (struct gcc_options *opts) int probe_interval = param_stack_clash_protection_probe_interval; if (guard_size != probe_interval) - error ("stack clash guard size %<%d%> must be equal to probing interval " - "%<%d%>", guard_size, probe_interval); + error ("%<--param stack-clash-protection-probe-interval=%d%> needs to match " + "%<--param stack-clash-protection-guard-size=%d%>", probe_interval, guard_size); /* Enable sw prefetching at specified optimization level for CPUS that have prefetch. Lower optimization level threshold by 1