From patchwork Fri Dec 23 15:18:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Magno de Almeida X-Patchwork-Id: 88955 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp3372177qgi; Fri, 23 Dec 2016 07:19:36 -0800 (PST) X-Received: by 10.84.218.204 with SMTP id g12mr29779195plm.78.1482506376639; Fri, 23 Dec 2016 07:19:36 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id r2si2901491pli.327.2016.12.23.07.19.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2016 07:19:36 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-445018-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-445018-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-445018-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; q=dns; s=default; b=ltbPeunG3DrF7Hv /3WMWZhHlOlST6Sq9uasjJ/Uu4h75obsxo4jk23d3NdrteDdtdkcalEBDNzCeZ9q FUg1yIrKICafJDHPa+onFDU6SrT26DFlzt2f3oYycWxqUsyHH0jdzPoHwcUDwG8i AbCH7T/AjGJ49hMTp0DzKTzxR3pw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; s=default; bh=HP1zCi4DOtOx1uWHbcgDB 0//aJ8=; b=RTVjObmyxctbC0kDNXRMgROJRXogW1ok8HJSLuH1PiYKNLpNdMKZ+ VO2/vtGCFe235k+orc/hEUnfA28dNxJYPvHyz4XPUc0S5zmwZ55CkQnnfDAoC/N4 8w7MCGos+Cea9dQ9YpiaPCm8CuAXyFS4Quamy1/Gy4gn48xJJRBKl4= Received: (qmail 7324 invoked by alias); 23 Dec 2016 15:19:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 7304 invoked by uid 89); 23 Dec 2016 15:19:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=Month, Minute, Equivalent, AVR X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-qk0-f175.google.com Received: from mail-qk0-f175.google.com (HELO mail-qk0-f175.google.com) (209.85.220.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Dec 2016 15:19:12 +0000 Received: by mail-qk0-f175.google.com with SMTP id n21so140825836qka.3; Fri, 23 Dec 2016 07:19:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=JhnMEq6Ihp8XtKy0yTtwo5UC07tJpt0zsrihbt7/404=; b=AdImZeuRmRsajYeVeWovKN6nU/zR2y25gC7aUH4IdLa5FjBDJ+UNKBOfC28MQOofbs q56ju9HWKKRom8B1z4m+c6j4gssYq0LKDkrBEzenfL+NYXuYviICENEiRsBDNwxHfcEY WlFK56HK57Jsu8bP82c4ZeaJLaJqtAO05AxtrMarqv9MqxqQy3sD1i5PHmcubJUqvYuX yHAqeOcdifhumnalTWvIGScCho5kPxgBLKe254hC4YSKvl6Phl9epfo2+s+YhbuP8m6D XrivKjdxtlI9KmXSJAhiKi7XfAjK4iVr6/xXkE4aDvXtBnw9/jFYimDqkqnw6LDOLvh+ o2xg== X-Gm-Message-State: AIkVDXKbqDmixQyJM2GRfEe6dox7AoZSlL5KpDWWvxvnsfOkVvGVV8vAc3sUqZvh34FFh1xxbswhlguTLNQddw== X-Received: by 10.55.49.7 with SMTP id x7mr5252914qkx.141.1482506350945; Fri, 23 Dec 2016 07:19:10 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.41.180 with HTTP; Fri, 23 Dec 2016 07:18:40 -0800 (PST) In-Reply-To: <20161216124520.GC895@redhat.com> References: <20161206184508.GQ6326@redhat.com> <20161215111524.GB20389@redhat.com> <20161216124520.GC895@redhat.com> From: Felipe Magno de Almeida Date: Fri, 23 Dec 2016 13:18:40 -0200 Message-ID: Subject: Re: Fix compilation errors with libstdc++v3 for AVR target and allow --enable-libstdcxx To: Jonathan Wakely Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-IsSubscribed: yes On Fri, Dec 16, 2016 at 10:45 AM, Jonathan Wakely wrote: > On 15/12/16 21:41 -0300, Felipe Magno de Almeida wrote: >> >> Good point. Do you want me to update the patch with __men or go your way >> with the wrapper? Hello Jonathan, > I think my wrapper's too ugly :-) :) > So please follow the same approach as for tm_mon (pass __mem to the > function, the copy it to tm_mon if there was no error). That adds a > write and a branch for every extracted field, which I hope shouldn't > have too much impact. Please find it attached. Changelog is the same: 2016-11-10 Felipe Magno de Almeida * include/bits/locale_facets_nonio.tcc: Avoid compilation errors with non-standard struct tm. -- Felipe Magno de Almeida >From f5da929741a2e58cfc9bcc4fab3f8b053d56d800 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Thu, 15 Sep 2016 18:52:57 -0300 Subject: [PATCH] Use temporary int objects to access struct tm members Call _M_extract_* functions family through temporary int objects, so it doesn't convert from lvalue to rvalue through a temporary in AVR because of the incompatible types used in AVR-Libc. This fixes compilation errors with AVR-Libc while compiling libstdc++ for AVR target. --- libstdc++-v3/include/bits/locale_facets_nonio.tcc | 44 ++++++++++++++++------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.tcc b/libstdc++-v3/include/bits/locale_facets_nonio.tcc index 1a4f9a0..306dd2e 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc @@ -659,30 +659,38 @@ _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 // Abbreviated weekday name [tm_wday] const char_type* __days1[7]; __tp._M_days_abbreviated(__days1); - __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days1, + __beg = _M_extract_name(__beg, __end, __mem, __days1, 7, __io, __tmperr); + if (!__tmperr) + __tm->tm_wday = __mem; break; case 'A': // Weekday name [tm_wday]. const char_type* __days2[7]; __tp._M_days(__days2); - __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days2, + __beg = _M_extract_name(__beg, __end, __mem, __days2, 7, __io, __tmperr); + if (!__tmperr) + __tm->tm_wday = __mem; break; case 'h': case 'b': // Abbreviated month name [tm_mon] const char_type* __months1[12]; __tp._M_months_abbreviated(__months1); - __beg = _M_extract_name(__beg, __end, __tm->tm_mon, + __beg = _M_extract_name(__beg, __end, __mem, __months1, 12, __io, __tmperr); + if (!__tmperr) + __tm->tm_mon = __mem; break; case 'B': // Month name [tm_mon]. const char_type* __months2[12]; __tp._M_months(__months2); - __beg = _M_extract_name(__beg, __end, __tm->tm_mon, + __beg = _M_extract_name(__beg, __end, __mem, __months2, 12, __io, __tmperr); + if (!__tmperr) + __tm->tm_mon = __mem; break; case 'c': // Default time and date representation. @@ -693,18 +701,22 @@ _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 break; case 'd': // Day [01, 31]. [tm_mday] - __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 1, 31, 2, + __beg = _M_extract_num(__beg, __end, __mem, 1, 31, 2, __io, __tmperr); + if (!__tmperr) + __tm->tm_mday = __mem; break; case 'e': // Day [1, 31], with single digits preceded by // space. [tm_mday] if (__ctype.is(ctype_base::space, *__beg)) - __beg = _M_extract_num(++__beg, __end, __tm->tm_mday, 1, 9, + __beg = _M_extract_num(++__beg, __end, __mem, 1, 9, 1, __io, __tmperr); else - __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 10, 31, + __beg = _M_extract_num(__beg, __end, __mem, 10, 31, 2, __io, __tmperr); + if (!__tmperr) + __tm->tm_mday = __mem; break; case 'D': // Equivalent to %m/%d/%y.[tm_mon, tm_mday, tm_year] @@ -715,13 +727,17 @@ _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 break; case 'H': // Hour [00, 23]. [tm_hour] - __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 0, 23, 2, + __beg = _M_extract_num(__beg, __end, __mem, 0, 23, 2, __io, __tmperr); + if (!__tmperr) + __tm->tm_hour = __mem; break; case 'I': // Hour [01, 12]. [tm_hour] - __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 1, 12, 2, + __beg = _M_extract_num(__beg, __end, __mem, 1, 12, 2, __io, __tmperr); + if (!__tmperr) + __tm->tm_hour = __mem; break; case 'm': // Month [01, 12]. [tm_mon] @@ -732,8 +748,10 @@ _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 break; case 'M': // Minute [00, 59]. [tm_min] - __beg = _M_extract_num(__beg, __end, __tm->tm_min, 0, 59, 2, + __beg = _M_extract_num(__beg, __end, __mem, 0, 59, 2, __io, __tmperr); + if (!__tmperr) + __tm->tm_min = __mem; break; case 'n': if (__ctype.narrow(*__beg, 0) == '\n') @@ -752,11 +770,13 @@ _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 // Seconds. [tm_sec] // [00, 60] in C99 (one leap-second), [00, 61] in C89. #if _GLIBCXX_USE_C99 - __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 60, 2, + __beg = _M_extract_num(__beg, __end, __mem, 0, 60, 2, #else - __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 61, 2, + __beg = _M_extract_num(__beg, __end, __mem, 0, 61, 2, #endif __io, __tmperr); + if (!__tmperr) + __tm->tm_sec = __mem; break; case 't': if (__ctype.narrow(*__beg, 0) == '\t') -- 2.10.2