From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6520D3858C2C for ; Thu, 1 Feb 2024 19:00:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6520D3858C2C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6520D3858C2C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706814019; cv=none; b=nDnA43obEwr8mNfFmBJ4ybFQarQia5cw5NWzvbwqY+w/fxyc1Ga0Z/p6ujfjb66RSug2ojcvSI272a/Ei2i5VkkP20GMp9JpAcxHVZUAkOl99OdqA6aRqvaCQUd3WU3MZe79vGBE9b3OwMkuEiArIFfRgy8s8UGoZPjwzfxK48Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706814019; c=relaxed/simple; bh=J8keTHQWyYLTQNzB8xFb78JENRL+dXN1UKELbRMGDUc=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=THDxHYu2aBIQWfYWySkBSw3JNobUXl3yVDrKt+Rkp97TcXnWFx7N8WKGmw55FgKliIm2BhPP03zfyotcrMRBXDaohLVujSO4SdapRi5aRdDV5rzobOmkoa+qk0HGWAKbkkfQFmezSWxYp8X+wssqZL/neZTRaxDhjbu4jqZXcSA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706814016; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=PPu9rBUHIe+OKKo6FHRFo9GL6ylAiwQH95g0bDhVIk4=; b=VqygZgBvob1x9ko4wcLkrsr0Lnd5Cf3Vqbd7lBl4vvZB1hZ2a9zVJEYfrx2+p0QhG34Ycv ppNxrIsr6pDbKHH8UwIsueh9UH2mhWUAV2FeFv2bS/uNjuxc0S7ZfTQSOFsMx8GmsPJg01 S0AxZqOnYMSXH0f3O0qqMIyg0wTTKk4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-x4xsdp1QNOq8qm5-R6xY9A-1; Thu, 01 Feb 2024 14:00:08 -0500 X-MC-Unique: x4xsdp1QNOq8qm5-R6xY9A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 64F49106D06B; Thu, 1 Feb 2024 19:00:08 +0000 (UTC) Received: from calimero.vinschen.de (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 428A11BDB0; Thu, 1 Feb 2024 19:00:08 +0000 (UTC) Received: by calimero.vinschen.de (Postfix, from userid 500) id E7E91A80A33; Thu, 1 Feb 2024 20:00:02 +0100 (CET) Date: Thu, 1 Feb 2024 20:00:02 +0100 From: Corinna Vinschen To: Jeff Law Cc: newlib@sourceware.org Subject: Re: Problem with recent change to getlocalename_l Message-ID: Reply-To: newlib@sourceware.org Mail-Followup-To: Jeff Law , newlib@sourceware.org References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: Hi Jeff, [please do not cc me, I'm reading the mailing list all the time. Thanks!] On Feb 1 09:39, Jeff Law wrote: > > We're seeing a few ports fail to build newlib after this change: > > > commit 71511d4ac8686c2220093cc01525311d9c88bc4e > > Author: Corinna Vinschen > > Date: Sun Jan 21 13:23:09 2024 +0100 > > > > getlocalename_l: implement per SUS Base Specifications Issue 8 draft > > #include > > const char *getlocalename_l(int category, locale_t locobj); > > Most notably, we need a per-thread space to store the string > > returned if locobj is LC_GLOBAL_LOCALE. No errors are defined > > for getlocalename_l. So we can't use buffer allocation which > > might lead to an ENOMEM error. We have to use a "static" buffer > > in the per-thread state. > > Note that the feature test macro in locale.h is not quite correct. > > This needs to be fixed as soon as the > > pru-elf shows this failure: > > CC libc/stdlib/libc_a-btowc.o > In file included from > /home/jlaw/test/newlib-cygwin/newlib/libc/include/wchar.h:6, > from > /home/jlaw/test/newlib-cygwin/newlib/libc/stdlib/btowc.c:1: > /home/jlaw/test/newlib-cygwin/newlib/libc/stdlib/btowc.c: In function > 'btowc': > /home/jlaw/test/newlib-cygwin/newlib/libc/stdlib/btowc.c:24:3: error: > 'struct _misc_reent' has no member named '_getlocale_l_buf' > 24 | _REENT_CHECK_MISC(_REENT); > | ^~~~~~~~~~~~~~~~~ > > The tester is also seeing xstormy16-elf and msp430-elf fail in the same > manner. Given that this new functionality needs a 32 byte buffer, and given that _REENT_SMALL targets are... well... small, I made the new buffer optional via `#ifdef _MB_CAPABLE' in struct _misc_reent, which only used by _REENT_SMALL targets. Apparently I missed to take the _REENT_CHECK_MISC expression into account. AFAICS the culprit is the _REENT_INIT_MISC macro now. Can you please check if this change fixes the problem? diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h index 4e60c3096ae2..caf554b9c26a 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -514,7 +514,7 @@ struct _reent #define _REENT_CHECK_EMERGENCY(var) \ _REENT_CHECK(var, _emergency, char *, _REENT_EMERGENCY_SIZE, /* nothing */) -#define _REENT_INIT_MISC(var) do { \ +#define __REENT_INIT_MISC(var) do { \ struct _reent *_r = (var); \ _r->_misc->_strtok_last = _NULL; \ _r->_misc->_mblen_state.__count = 0; \ @@ -533,10 +533,18 @@ struct _reent _r->_misc->_wcrtomb_state.__value.__wch = 0; \ _r->_misc->_wcsrtombs_state.__count = 0; \ _r->_misc->_wcsrtombs_state.__value.__wch = 0; \ - _r->_misc->_getlocale_l_buf[0] = '\0'; \ _r->_misc->_l64a_buf[0] = '\0'; \ _r->_misc->_getdate_err = 0; \ } while (0) +#ifdef _MB_CAPABLE +#define _REENT_INIT_MISC(var) do { \ + struct _reent *_r = (var); \ + __REENT_INIT_MISC(_r) \ + _r->_misc->_getlocale_l_buf[0] = '\0'; \ +} while (0) +#else +#define _REENT_INIT_MISC(var) __REENT_INIT_MISC(var) +#endif #define _REENT_CHECK_MISC(var) \ _REENT_CHECK(var, _misc, struct _misc_reent *, sizeof *((var)->_misc), _REENT_INIT_MISC(var)) Thanks, Corinna