From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11038 invoked by alias); 11 Oct 2011 19:07:03 -0000 Received: (qmail 11028 invoked by uid 22791); 11 Oct 2011 19:07:01 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD,TW_BJ X-Spam-Check-By: sourceware.org Received: from mtagate2.uk.ibm.com (HELO mtagate2.uk.ibm.com) (194.196.100.162) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 11 Oct 2011 19:06:47 +0000 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p9BJ6jwh029563 for ; Tue, 11 Oct 2011 19:06:45 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9BJ6jxF2412662 for ; Tue, 11 Oct 2011 20:06:45 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9BJ6iB6023583 for ; Tue, 11 Oct 2011 13:06:45 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id p9BJ6h8k023538; Tue, 11 Oct 2011 13:06:43 -0600 Message-Id: <201110111906.p9BJ6h8k023538@d06av02.portsmouth.uk.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Tue, 11 Oct 2011 21:06:43 +0200 Subject: [commit] Fix condition (Re: [patch] Verify byte-by-byte if both files are the same on "remote:") To: jan.kratochvil@redhat.com (Jan Kratochvil) Date: Tue, 11 Oct 2011 19:07:00 -0000 From: "Ulrich Weigand" Cc: gdb-patches@sourceware.org In-Reply-To: <20111010202141.GA27651@host1.jankratochvil.net> from "Jan Kratochvil" at Oct 10, 2011 10:21:42 PM MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-10/txt/msg00324.txt.bz2 Jan Kratochvil wrote: > + if (verified_as_different || parent_objfile->crc32 != crc) > + warning (_("the debug information found in \"%s\"" > + " does not match \"%s\" (CRC mismatch).\n"), > + name, parent_objfile->name); I just noticed that this still causes spurious warnings since the condition is incorrect: we want to skip the warning if the parent's CRC matches the (potential) debuginfo *file* CRC, not the CRC the debuginfo is supposed to have. Fixed by the patch below. Tested on arm-linux-gnueabi in remote testing using --with-sysroot=remote: with no more spurious CRC mismatch warnings. Committed to mainline as obvious. Bye, Ulrich ChangeLog: * symfile.c (separate_debug_file_exists): Fix condition. Index: gdb/symfile.c =================================================================== RCS file: /cvs/src/src/gdb/symfile.c,v retrieving revision 1.318 diff -u -p -r1.318 symfile.c --- gdb/symfile.c 11 Oct 2011 12:58:08 -0000 1.318 +++ gdb/symfile.c 11 Oct 2011 18:33:12 -0000 @@ -1418,7 +1418,7 @@ separate_debug_file_exists (const char * return 0; } - if (verified_as_different || parent_objfile->crc32 != crc) + if (verified_as_different || parent_objfile->crc32 != file_crc) warning (_("the debug information found in \"%s\"" " does not match \"%s\" (CRC mismatch).\n"), name, parent_objfile->name); -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com