From patchwork Sun Sep 18 23:36:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 15760 Received: (qmail 82581 invoked by alias); 18 Sep 2016 23:37:04 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 82569 invoked by uid 89); 18 Sep 2016 23:37:03 -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=Hx-languages-length:1866, opportunity 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; Sun, 18 Sep 2016 23:37:01 +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 D0618C077547 for ; Sun, 18 Sep 2016 23:37:00 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8INaxB4014315 for ; Sun, 18 Sep 2016 19:37:00 -0400 Subject: [pushed] gdb/s390: Fix build breakage due to std::min/std::max usage without header To: gdb-patches@sourceware.org References: <1473958336-23920-1-git-send-email-palves@redhat.com> <4e2937a7-f70d-574f-75b8-78faab90fddc@ericsson.com> <77416303-1ed7-fe71-7a52-1dbd1ca6aa56@redhat.com> From: Pedro Alves Message-ID: <545685b9-b9b5-a62e-3d79-a4d0e15e66d5@redhat.com> Date: Mon, 19 Sep 2016 00:36:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <77416303-1ed7-fe71-7a52-1dbd1ca6aa56@redhat.com> On 09/16/2016 08:00 PM, Pedro Alves wrote: > From 325fac504a327de9c46a4e5cf9c88ece9d9d7701 Mon Sep 17 00:00:00 2001 > From: Pedro Alves > Date: Fri, 16 Sep 2016 19:55:17 +0100 > Subject: [PATCH] gdb: Use std::min and std::max throughout This broke the build on s390. I've pushed the obvious fix below. Hindsight is showing I have lost a good opportunity to try the trybot... From 93689493b376c4e5616c1679733619f96202c369 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 19 Sep 2016 00:30:30 +0100 Subject: [PATCH] gdb/s390: Fix build breakage due to std::min/std::max usage without header [...] .../gdb/s390-linux-nat.c: In function 'void s390_prepare_to_resume(lwp_info*)': .../gdb/s390-linux-nat.c:703:20: error: 'min' is not a member of 'std' watch_lo_addr = std::min (watch_lo_addr, area->lo_addr); [...] gdb/ChangeLog: 2016-09-18 Pedro Alves * s390-linux-nat.c: Include . --- gdb/ChangeLog | 4 ++++ gdb/s390-linux-nat.c | 1 + 2 files changed, 5 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f86e0a4..830d5de 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2016-09-18 Pedro Alves + * s390-linux-nat.c: Include . + +2016-09-18 Pedro Alves + * breakpoint.c (hardware_watchpoint_inserted_in_range): Explicitly specify the std:min/std::max specialization. * exec.c (section_table_read_available_memory): Likewise. diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c index 687502c..9abb5c2 100644 --- a/gdb/s390-linux-nat.c +++ b/gdb/s390-linux-nat.c @@ -39,6 +39,7 @@ #include #include #include +#include /* Per-thread arch-specific data. */