From patchwork Tue Oct 11 19:31:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weigand X-Patchwork-Id: 4635 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F182423DED for ; Tue, 11 Oct 2011 19:32:02 +0000 (UTC) Received: from mail-dy0-f52.google.com (mail-dy0-f52.google.com [209.85.220.52]) by fiordland.canonical.com (Postfix) with ESMTP id DDAC1A183AD for ; Tue, 11 Oct 2011 19:32:02 +0000 (UTC) Received: by dyj10 with SMTP id 10so519101dyj.11 for ; Tue, 11 Oct 2011 12:32:02 -0700 (PDT) Received: by 10.223.85.139 with SMTP id o11mr41411027fal.0.1318361522515; Tue, 11 Oct 2011 12:32:02 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.24.41 with SMTP id r9cs182478laf; Tue, 11 Oct 2011 12:32:01 -0700 (PDT) Received: by 10.227.176.78 with SMTP id bd14mr8507584wbb.70.1318361519514; Tue, 11 Oct 2011 12:31:59 -0700 (PDT) Received: from mtagate7.uk.ibm.com (mtagate7.uk.ibm.com. [194.196.100.167]) by mx.google.com with ESMTPS id ge4si17270486wbb.48.2011.10.11.12.31.59 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Oct 2011 12:31:59 -0700 (PDT) Received-SPF: pass (google.com: domain of uweigand@de.ibm.com designates 194.196.100.167 as permitted sender) client-ip=194.196.100.167; Authentication-Results: mx.google.com; spf=pass (google.com: domain of uweigand@de.ibm.com designates 194.196.100.167 as permitted sender) smtp.mail=uweigand@de.ibm.com Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p9BJVvfb010708 for ; Tue, 11 Oct 2011 19:31:57 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9BJVvEI2347228 for ; Tue, 11 Oct 2011 20:31:57 +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 p9BJVvlu001736 for ; Tue, 11 Oct 2011 13:31:57 -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 p9BJVuCY001696 for ; Tue, 11 Oct 2011 13:31:56 -0600 Message-Id: <201110111931.p9BJVuCY001696@d06av02.portsmouth.uk.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Tue, 11 Oct 2011 21:31:56 +0200 Subject: [commit] Fix condition (Re: [patch] Verify byte-by-byte if both files are the same on "remote:") To: patches@linaro.org Date: Tue, 11 Oct 2011 21:31:56 +0200 (CEST) From: "Ulrich Weigand" X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 http://sourceware.org/ml/gdb-patches/2011-10/msg00324.html 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);