From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by sourceware.org (Postfix) with ESMTPS id EB3653858CDA for ; Fri, 23 Feb 2024 15:35:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EB3653858CDA 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 EB3653858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=91.207.212.93 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708702570; cv=none; b=ExHWC3vuTQGOtR/szYNckRaj5EXBi50hCh1ZZTcqwGLQs11QovqAYRySh5diys5K7BOi6ECtqABF8rBPKXVrPAe26pHZdupS5VmS7EbI8GSKxGfIz7cN3eTzbYLPfl4pji+cVXYHuHGaW8RSrSkFMoePztJDhAC47yA0U4SSCa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708702570; c=relaxed/simple; bh=9af0fdzt3NRrwTktDnHw2aEWM6mqipy41rFkAfMQGQU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ka6unjzhlzxYX81xoEUxt3ZXcYD7wdWa2RnycpHflNuqeDVzd7Cg3RoDdVdzD5lAapxx22itP3vd5SVbBnLCWirlUPuguSN/en6vfboJEunTmucEegwc3fXC5jPQjj9YA/keFRksfnEwUjo3oEcoBcOkpR81o2UpzTjttxD0wbQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41NCwTPL014794; Fri, 23 Feb 2024 16:35:57 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= selector1; bh=Ra/6eOYtQRS3Mbv0XBkkhDoV2pFO+vFA/veoMekUAsE=; b=4z lgqBPgEwgbpFbwTF17DuRPSebYvB1SDT5GLmIm7sEy2+LC38jXaY2ZFgf6BcWjhm BIyOjI1YIFH1M1O90ZPJZLqflw3HsW3vWD4a9wx0rgD1HyUYIMI/KoUgUrMee9Di YXCI/ngGo62bqbgRXbl/1bTER4DkIFuxsxOOyzoIS0B6fdiK0+BZQ3N/K2mFmsh8 VFHtGywSCfDdR8l7XK7UuAcRJwKMD4bYSnNCjTbImIWetXZNml306a2kMZFG3z2O l872pvhVw6UwcxHS5uyJ64USlHS0IstyGXbEeJKFxk3vps5vZvAE9/hvKeQYpoEB P6JNHa1EbPSG4zP9TblQ== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3wd203w7vk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Feb 2024 16:35:57 +0100 (CET) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id D8EAF4002D; Fri, 23 Feb 2024 16:35:52 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 91DEE277B29; Fri, 23 Feb 2024 16:35:42 +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; Fri, 23 Feb 2024 16:35:42 +0100 From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= To: CC: , =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= , Yvan ROUX Subject: [PATCH] libc/stdio: Remove wchar_t functions from NEWLIB_NANO_FORMATTED_IO Date: Fri, 23 Feb 2024 16:31:12 +0100 Message-ID: <20240223153111.3265858-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-23_01,2024-02-23_01,2023-05-22_02 X-Spam-Status: No, score=-11.4 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 I regtested this, I used the official Ubuntu 20.04 package of automake 1.15. When generating the Makefile.in, I do see a few entries that I did not expect, so therfore I would like someone with the right versions to generate the Makefile.in and submit this for me. The alternative approach to this patch is to figure out what functions (in addition to __ssputws_r) that is also needed in nano formatted io. -- Regression tested in basepoints/gcc-14-9032-g945cb8490cb with arm-none-eabi. Example failure without this change: $ arm-none-eabi-g++ .../pr100611.C -std=c++20 --specs=nosys.specs -o /dev/null --specs=nano.specs .../ld: .../libc_nano.a(libc_a-svfwprintf.o): in function `_svfwprintf_r': (.text._svfwprintf_r+0xd8): undefined reference to `__ssputws_r' .../ld: (.text._svfwprintf_r+0x834): undefined reference to `__ssputws_r' .../ld: (.text._svfwprintf_r+0x85c): undefined reference to `__ssputws_r' .../ld: (.text._svfwprintf_r+0x8a8): undefined reference to `__ssputws_r' .../ld: (.text._svfwprintf_r+0x8dc): undefined reference to `__ssputws_r' .../ld: .../libc_nano.a(libc_a-svfwprintf.o):(.text._svfwprintf_r+0x900): more undefined references to `__ssputws_r' follow collect2: error: ld returned 1 exit status Signed-off-by: Torbjörn SVENSSON Co-authored-by: Yvan ROUX --- newlib/libc/stdio/Makefile.inc | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/newlib/libc/stdio/Makefile.inc b/newlib/libc/stdio/Makefile.inc index e25680212..ce298e5cb 100644 --- a/newlib/libc/stdio/Makefile.inc +++ b/newlib/libc/stdio/Makefile.inc @@ -41,7 +41,14 @@ libc_a_SOURCES += \ %D%/ssputs_r.c \ %D%/ssputws_r.c \ %D%/ssprint_r.c \ - %D%/sswprint_r.c + %D%/sswprint_r.c \ + %D%/svfiwprintf.c \ + %D%/svfiwscanf.c \ + %D%/svfwprintf.c \ + %D%/svfwscanf.c \ + %D%/vfiwprintf.c \ + %D%/vfiwscanf.c \ + %D%/vfwscanf.c endif libc_a_SOURCES += \ @@ -100,17 +107,10 @@ libc_a_SOURCES += \ %D%/sprintf.c \ %D%/sscanf.c \ %D%/stdio.c \ - %D%/svfiwprintf.c \ - %D%/svfiwscanf.c \ - %D%/svfwprintf.c \ - %D%/svfwscanf.c \ %D%/tmpfile.c \ %D%/tmpnam.c \ %D%/ungetc.c \ %D%/vdprintf.c \ - %D%/vfiwprintf.c \ - %D%/vfiwscanf.c \ - %D%/vfwscanf.c \ %D%/vprintf.c \ %D%/vscanf.c \ %D%/vsnprintf.c \ @@ -127,13 +127,13 @@ if !ELIX_LEVEL_1 %D%/fcloseall.c \ %D%/fseeko.c \ %D%/ftello.c \ - %D%/getw.c \ %D%/mktemp.c \ - %D%/putw.c \ %D%/vasprintf.c if !NEWLIB_NANO_FORMATTED_IO %C%_ELIX_2_SOURCES += \ %D%/asiprintf.c \ + %D%/getw.c \ + %D%/putw.c \ %D%/vasiprintf.c endif !NEWLIB_NANO_FORMATTED_IO endif !ELIX_LEVEL_1 @@ -157,52 +157,52 @@ else %D%/fflush_u.c \ %D%/fgetc_u.c \ %D%/fgets_u.c \ - %D%/fgetwc.c \ - %D%/fgetwc_u.c \ - %D%/fgetws.c \ - %D%/fgetws_u.c \ %D%/fileno_u.c \ %D%/fmemopen.c \ %D%/fopencookie.c \ %D%/fpurge.c \ %D%/fputc_u.c \ %D%/fputs_u.c \ + %D%/fread_u.c \ + %D%/fsetlocking.c \ + %D%/funopen.c \ + %D%/fwrite_u.c \ + %D%/open_memstream.c \ + %D%/stdio_ext.c \ + %D%/vasnprintf.c +if !NEWLIB_NANO_FORMATTED_IO +%C%_ELIX_4_SOURCES += \ + %D%/asniprintf.c \ + %D%/diprintf.c \ + %D%/fgetwc.c \ + %D%/fgetwc_u.c \ + %D%/fgetws.c \ + %D%/fgetws_u.c \ %D%/fputwc.c \ %D%/fputwc_u.c \ %D%/fputws.c \ %D%/fputws_u.c \ - %D%/fread_u.c \ - %D%/fsetlocking.c \ - %D%/funopen.c \ %D%/fwide.c \ %D%/fwprintf.c \ - %D%/fwrite_u.c \ %D%/fwscanf.c \ %D%/getwc.c \ %D%/getwc_u.c \ %D%/getwchar.c \ %D%/getwchar_u.c \ - %D%/open_memstream.c \ %D%/putwc.c \ %D%/putwc_u.c \ %D%/putwchar.c \ %D%/putwchar_u.c \ - %D%/stdio_ext.c \ %D%/swprintf.c \ %D%/swscanf.c \ %D%/ungetwc.c \ - %D%/vasnprintf.c \ + %D%/vasniprintf.c \ %D%/vswprintf.c \ %D%/vswscanf.c \ %D%/vwprintf.c \ %D%/vwscanf.c \ %D%/wprintf.c \ %D%/wscanf.c -if !NEWLIB_NANO_FORMATTED_IO -%C%_ELIX_4_SOURCES += \ - %D%/asniprintf.c \ - %D%/diprintf.c \ - %D%/vasniprintf.c endif !NEWLIB_NANO_FORMATTED_IO endif !ELIX_LEVEL_3 endif !ELIX_LEVEL_2 -- 2.25.1