From patchwork Wed Apr 6 14:49:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 11651 Received: (qmail 11021 invoked by alias); 6 Apr 2016 14:49:34 -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 10955 invoked by uid 89); 6 Apr 2016 14:49:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2816 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 06 Apr 2016 14:49:31 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 2464346201 for ; Wed, 6 Apr 2016 14:49:30 +0000 (UTC) Received: from host1.jankratochvil.net (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u36EnQNY023823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 6 Apr 2016 10:49:29 -0400 Date: Wed, 6 Apr 2016 16:49:26 +0200 From: Jan Kratochvil To: Pedro Alves Cc: gdb-patches@sourceware.org, Gary Benson Subject: [commit fix] Revert check-in by a mistake in the previous commit [Re: [commit] Suggest newer gdbserver if it has no qXfer:exec-file:read] Message-ID: <20160406144926.GA32051@host1.jankratochvil.net> References: <20160319201842.GA16540@host1.jankratochvil.net> <56F13963.9040204@redhat.com> <20160322131604.GA24312@host1.jankratochvil.net> <56F14F1E.5010606@redhat.com> <20160323211547.GA17400@host1.jankratochvil.net> <5703EE91.7040409@redhat.com> <20160406143413.GA2885@host1.jankratochvil.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160406143413.GA2885@host1.jankratochvil.net> User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes gdb/ChangeLog 2016-04-06 Jan Kratochvil * remote.c: Revert check-in by a mistake in the previous commit. --- gdb/ChangeLog | 4 ++++ gdb/remote.c | 27 --------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c59249f..e362360 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,8 @@ 2016-04-06 Jan Kratochvil + + * remote.c: Revert check-in by a mistake in the previous commit. + +2016-04-06 Jan Kratochvil Pedro Alves * exec.c (exec_file_locate_attach): Print warning for unsupported diff --git a/gdb/remote.c b/gdb/remote.c index a88f4cd..5c407b6 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -1496,15 +1496,6 @@ enum { static struct packet_config remote_protocol_packets[PACKET_MAX]; -/* gdbserver < 7.7 (before its fix from 2013-12-11) did reply to any - unknown 'v' packet with string "OK". "OK" gets interpreted by GDB - as a reply to known packet. For packet "vFile:setfs:" it is an - invalid reply and GDB would return error in - remote_hostio_set_filesystem, making remote files access impossible. - If this variable is non-zero it means the remote gdbserver is buggy - and any not yet detected packets are assumed as unsupported. */ -static int unknown_v_replies_ok; - /* Returns the packet's corresponding "set remote foo-packet" command state. See struct packet_config for more details. */ @@ -1528,9 +1519,6 @@ packet_config_support (struct packet_config *config) case AUTO_BOOLEAN_FALSE: return PACKET_DISABLE; case AUTO_BOOLEAN_AUTO: - if (unknown_v_replies_ok && config->name != NULL - && config->name[0] == 'v') - return PACKET_DISABLE; return config->support; default: gdb_assert_not_reached (_("bad switch")); @@ -4035,21 +4023,6 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p) if (packet_support (PACKET_QAllow) != PACKET_DISABLE) remote_set_permissions (target); - /* See unknown_v_replies_ok description. */ - { - const char v_mustreplyempty[] = "vMustReplyEmpty"; - - putpkt (v_mustreplyempty); - getpkt (&rs->buf, &rs->buf_size, 0); - if (strcmp (rs->buf, "OK") == 0) - unknown_v_replies_ok = 1; - else if (strcmp (rs->buf, "") == 0) - unknown_v_replies_ok = 0; - else - error (_("Remote replied unexpectedly to '%s': %s"), v_mustreplyempty, - rs->buf); - } - /* Next, we possibly activate noack mode. If the QStartNoAckMode packet configuration is set to AUTO,