From patchwork Mon Dec 12 18:04:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 87727 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1780799qgi; Mon, 12 Dec 2016 10:05:09 -0800 (PST) X-Received: by 10.99.149.66 with SMTP id t2mr91584527pgn.156.1481565909277; Mon, 12 Dec 2016 10:05:09 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id f12si44300249pgn.136.2016.12.12.10.05.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 10:05:09 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-444201-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-444201-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-444201-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; q=dns; s=default; b=pYtXNO/vXqzUevMYf1AerW1Wwz6esF LboQyF6G/QRcrwh4yGSSDgM17yTD68/kNEizR1uLNncflxYkUKjyF+t3sS/CxjgF vMbDaFan+MSELhodAOjU0YppX8WobtlazuthosG6Xs54/aCmmls8LzUk7KAwX+Mq V/YAj8qG99Ens= 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:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; s=default; bh=y7BAtHV+UeJm6/uAq6+eWn3rS2o=; b=oAAt ymQNhVtNs0FcDu1Q7Ybtm0WTQ9CXYFF0VW9IGlDRx5tdqZloNRIjg+SGvSo7fYC7 a27/h78J0QmNatgkB7bb53AkV+dTzTWqWyteBuTb3LFH00e2HqWsICOpcc1s1uDR 0JloRkou3CXQHkXFdzVR/6Na21QT/uY2y2NmJOY= Received: (qmail 40032 invoked by alias); 12 Dec 2016 18:04:48 -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 40008 invoked by uid 89); 12 Dec 2016 18:04:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-5.0 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=crazy X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Dec 2016 18:04:46 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 956603F722; Mon, 12 Dec 2016 18:04:45 +0000 (UTC) Received: from localhost (ovpn-116-115.ams2.redhat.com [10.36.116.115]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBCI4itT023763; Mon, 12 Dec 2016 13:04:45 -0500 Date: Mon, 12 Dec 2016 18:04:44 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [PATCH] Backport all Filesystem library fixes from trunk Message-ID: <20161212180444.GN6326@redhat.com> References: <20161212140907.GA28962@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161212140907.GA28962@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.7.1 (2016-10-04) On 12/12/16 14:09 +0000, Jonathan Wakely wrote: >This syncs the std::experimental::filesystem code on gcc-6-branch to >match what's on trunk, except that the C++17 std::string_view type >doesn't exist on the branch, so the filesystem::path type only >supports experimental::string_view. > >I'm doing it as one big patch, rather than backporting 26 individual >patches. [snip] >Tested x86_64-linux, committed to gcc-6-branch. > >I'll backport most of this to gcc-5-branch too, I think the gcc-6 >patch should apply cleanly, but I'll need to adjust the tests to not >use { dg-do action { target c++11 } } as that's only on trunk and >gcc-6-branch. I missed these two fixes for the configure tests for Filesystem. Committed to gcc-6-branch, will commit to 5 once testing completes. Somehow I managed to commit a load of duplicate ChangeLog entries in the commits from r243569 to r243574. Git-svn went crazy. I've cleaned that up now. commit 00c16d2d9e7e985ca3d43e19ae78e6613588fa4a Author: Jonathan Wakely Date: Mon Dec 12 16:46:49 2016 +0000 Add missing header in Filesystem TS configure tests Backport from mainline 2016-10-26 Uros Bizjak * acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Include for PATH_MAX in realpath test. * configure: Regenerate. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 4b951d8..ce44a6a 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4343,6 +4343,7 @@ dnl AC_CACHE_VAL(glibcxx_cv_realpath, [dnl GCC_TRY_COMPILE_OR_LINK( [ + #include #include #include ], commit dbe360643e28f6efe2f5d296784fee9eab849b54 Author: redi Date: Wed May 25 16:13:52 2016 +0000 Fix configure test for sendfile() Backport from mainline 2016-05-25 Jonathan Wakely * acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Fix test for sendfile. * configure: Regenerate. * config.h.in: Regenerate. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index c453145..4b951d8 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4433,7 +4433,7 @@ dnl gnu* | linux* | solaris*) GCC_TRY_COMPILE_OR_LINK( [#include ], - [sendfile(1, 2, (off_t*)NULL, sizeof 1);], + [sendfile(1, 2, (off_t*)0, sizeof 1);], [glibcxx_cv_sendfile=yes], [glibcxx_cv_sendfile=no]) ;; @@ -4443,7 +4443,7 @@ dnl esac ]) if test $glibcxx_cv_sendfile = yes; then - AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in .]) + AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in .]) fi AC_MSG_RESULT($glibcxx_cv_sendfile) dnl