From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id F11103943429; Fri, 14 May 2021 14:56:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F11103943429 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] nvptx: Fix up nvptx build against latest libstdc++ [PR100375] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: 47316972d8f81363903b39fbe5313c5b013b09e7 X-Git-Newrev: 1306ca8ae5477bd4872b85018e5db2ee6a5ea8a4 Message-Id: <20210514145657.F11103943429@sourceware.org> Date: Fri, 14 May 2021 14:56:57 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2021 14:56:58 -0000 https://gcc.gnu.org/g:1306ca8ae5477bd4872b85018e5db2ee6a5ea8a4 commit 1306ca8ae5477bd4872b85018e5db2ee6a5ea8a4 Author: Jakub Jelinek Date: Sun May 2 14:17:23 2021 +0200 nvptx: Fix up nvptx build against latest libstdc++ [PR100375] The r12-220-gd96db15967e78d7cecea3b1cf3169ceb924678ac change deprecated some non-standard std::pair constructors and that apparently broke nvptx.c build, where pseudo_node_t is std::pair and so nullptr (or NULL) needs to be used for the first argument of the ctors instead of 0. 2021-05-02 Jakub Jelinek PR target/100375 * config/nvptx/nvptx.c (nvptx_sese_pseudo): Use NULL instead of 0 as first argument of pseudo_node_t constructors. (cherry picked from commit 7911a905276781c20f704f5a91b5125e0184d072) Diff: --- gcc/config/nvptx/nvptx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 07ff1df4bb8..011551852ab 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -3415,9 +3415,9 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, edge e; edge_iterator (ei); int hi_back = depth; - pseudo_node_t node_back (0, depth); + pseudo_node_t node_back (NULL, depth); int hi_child = depth; - pseudo_node_t node_child (0, depth); + pseudo_node_t node_child (NULL, depth); basic_block child = NULL; unsigned num_children = 0; int usd = -dir * sese->dir; @@ -3484,7 +3484,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, else { /* Fallen off graph, backlink to entry node. */ hi_back = 0; - node_back = pseudo_node_t (0, 0); + node_back = pseudo_node_t (NULL, 0); } } @@ -3505,7 +3505,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, else { /* back edge to entry node */ - sese->push (pseudo_node_t (0, 0)); + sese->push (pseudo_node_t (NULL, 0)); } } @@ -3514,7 +3514,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, if (!sese->brackets.length () || !edges || !edges->length ()) { hi_back = 0; - node_back = pseudo_node_t (0, 0); + node_back = pseudo_node_t (NULL, 0); sese->push (node_back); }