From c144ea2e1eebc48f54b9a9c4042a47f8499feba4 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 4 Jun 2009 19:24:11 -0400 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20skip=20changed=20=3D=20true=20fo?= =?utf8?q?r=20bug=20patches.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- objmanip.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/objmanip.c b/objmanip.c index 18f3177..4f27e92 100644 --- a/objmanip.c +++ b/objmanip.c @@ -977,15 +977,6 @@ static void compare_spans(struct span *old_span, struct span *new_span) } return; } - if (old_span->ss->type == SS_TYPE_BUGTABLE && - new_span->ss->type == SS_TYPE_BUGTABLE && relocs_match) { - if (new_span->bugpatch) - return; - debug1(newsbfd, "Changing %s due to nonmatching line numbers\n", - new_span->label); - new_span->bugpatch = true; - return; - } char *reason; if (new_span->contents_size != old_span->contents_size) @@ -1001,6 +992,13 @@ static void compare_spans(struct span *old_span, struct span *new_span) new_span->patch = true; debug1(newsbfd, "Changing %s due to %s\n", new_span->label, reason); + } else if (old_span->ss->type == SS_TYPE_BUGTABLE && + new_span->ss->type == SS_TYPE_BUGTABLE && relocs_match) { + if (new_span->bugpatch) + return; + debug1(newsbfd, "Changing %s due to %s\n", + new_span->label, reason); + new_span->bugpatch = true; } else if (new_span->ss->type == SS_TYPE_RODATA && new_span->contents_size == old_span->contents_size) { if (new_span->datapatch) -- 2.11.4.GIT