From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by sourceware.org (Postfix) with ESMTPS id 0DDE73858CD1 for ; Sun, 17 Dec 2023 21:16:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0DDE73858CD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0DDE73858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=185.132.182.106 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702847802; cv=none; b=ftKEjtCH1VKYB27/Y0G1D1skUeQkloU69eICQNmc6bHl5bu6QGXni3C827FxNLkB3FVve7LLv/gmOQ1lppB5y3xXodUi6jmk1dqvIN+wH+ZM3PeqPfl5DOvjcrsfrf5o2ywgrZ6I3eimLW/7jX3Q1Y8eAJK3TBj0FHq81U32vC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702847802; c=relaxed/simple; bh=040VQLs72zi+hP2Z4NcEqE0FPSYbjtb/b/qesxAUrM0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TBUqFcGKpvH2UWVNdu83lecUtPI33+jWbloDbPWszNNefJXkLCodKtJD366XPfaVk8tILacGQ/QMZJJNGUA6NzyqvcUfbDn8B+YGP6RYyTeUgEILEDHWO+4pIxHV9Brp3HfutHe3d8ZPCUrGl3D39m24A2mxqI0/0ww0Z6z8Sw8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0369458.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3BHI2Sia002766 for ; Sun, 17 Dec 2023 22:16:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=selector1; bh=2CBjIeanZ5jd5YSsYbwR Dj9v9aGEOWmTgZFcWA1XpXc=; b=5VI1BLKfPMp7pmNZf1z0SLHOKoiP0XGFpk0Z vejr8h0tL3FNgaHdnj2xdGGr6hvak/uKR/7qL8TIB94tgSzW/QZSAWgxITDTNfCT YDM+qg6haQyRCydhH1G83RKJ3EAKrb+zvz1bzk5YGSkFCQ2J+ZW4S1Shp3RHcn6n uukPSRQFBT3N2wgovw2+kQH+iTtRAnAWffg7YY+zZh/C/JHZ13d3NHzJoGszvVHF GAtH/4+fBdnr/tBTzoReQLya8LWtmgwqNA3wWBh2b8oTZtTKWXaA/1BzXOw/jlzJ unqi0mJqp/PVZ/kZvGG+2p7K4pWmCalOEhUEp2Q+GPxyPqqnkQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3v1pb4a9m6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 17 Dec 2023 22:16:34 +0100 (CET) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4154110005D for ; Sun, 17 Dec 2023 22:16:33 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 0E789208D48 for ; Sun, 17 Dec 2023 22:16:33 +0100 (CET) Received: from jkgcxl0004.jkg.st.com (10.74.22.255) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Sun, 17 Dec 2023 22:16:32 +0100 From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= To: CC: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= Subject: [PATCH] ld: Print 0 size in B and not in GB Date: Sun, 17 Dec 2023 22:16:08 +0100 Message-ID: <20231217211607.270091-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.74.22.255] X-ClientProxiedBy: EQNCAS1NODE3.st.com (10.75.129.80) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-17_07,2023-12-14_01,2023-05-22_02 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,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 List-Id: When using --print-memory-usage, the printed size can be zero and in that case, the unit should be B and not GB. ld/ * ldlang.c (lang_print_memory_size) Print 0 B instead of 0 GB. * testsuite/ld-scripts/print-memory-usage-1.l: Validate emplty region. * testsuite/ld-scripts/print-memory-usage-1.t: Define empty region. Signed-off-by: Torbjörn SVENSSON --- ld/ldlang.c | 4 +++- ld/testsuite/ld-scripts/print-memory-usage-1.l | 1 + ld/testsuite/ld-scripts/print-memory-usage-1.t | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ld/ldlang.c b/ld/ldlang.c index 566c2b8326f..105404adcfb 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -9921,7 +9921,9 @@ lang_ld_feature (char *str) static void lang_print_memory_size (uint64_t sz) { - if ((sz & 0x3fffffff) == 0) + if (sz == 0) + printf (" %10" PRIu64 " B", sz); + else if ((sz & 0x3fffffff) == 0) printf ("%10" PRIu64 " GB", sz >> 30); else if ((sz & 0xfffff) == 0) printf ("%10" PRIu64 " MB", sz >> 20); diff --git a/ld/testsuite/ld-scripts/print-memory-usage-1.l b/ld/testsuite/ld-scripts/print-memory-usage-1.l index e666a632c96..c59722059fd 100644 --- a/ld/testsuite/ld-scripts/print-memory-usage-1.l +++ b/ld/testsuite/ld-scripts/print-memory-usage-1.l @@ -1,3 +1,4 @@ Memory region Used Size Region Size %age Used ROM: 32 B 1 KB 3.1[23]% RAM: 32 B 256 KB 0.01% + FOO: 0 B 1 KB 0.00% diff --git a/ld/testsuite/ld-scripts/print-memory-usage-1.t b/ld/testsuite/ld-scripts/print-memory-usage-1.t index 97065b30c52..56484f451c5 100644 --- a/ld/testsuite/ld-scripts/print-memory-usage-1.t +++ b/ld/testsuite/ld-scripts/print-memory-usage-1.t @@ -2,4 +2,5 @@ MEMORY { ROM (RX) : ORIGIN = 0x1000, LENGTH = 1K RAM (W) : ORIGIN = 0x100000, LENGTH = 256K + FOO (RX) : ORIGIN = 0x100, LENGTH = 1K } -- 2.25.1