From d974d0f8b7cf95e6faa43a5e131fdd2f91bd8d37 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 19 Mar 2009 23:08:37 -0700
Subject: [PATCH] auto import from //branches/cupcake_rel/...@141571

---
 elfcopy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elfcopy.c b/elfcopy.c
index 540e3d7..03c9154 100644
--- a/elfcopy.c
+++ b/elfcopy.c
@@ -2160,7 +2160,7 @@ static Elf64_Off section_to_header_mapping(Elf *elf,
                 INFO("\n\t\t");
             }
             else
-              INFO("(!) %-17s does not match\n\t\t", shdr_info[inner].name);
+              INFO("(!) %-17s does not belong\n\t\t", shdr_info[inner].name);
         }
         else
           INFO("(!) %-17s is not considered, it is being removed\n\t\t", shdr_info[inner].name);
@@ -2778,7 +2778,7 @@ update_section_offsets(Elf *elf,
 
     GElf_Off lastoffset = 0;
     lastoffset += ehdr_size;
-    lastoffset += (ehdr->e_phnum + 1) * ehdr->e_phentsize;
+    lastoffset += ehdr->e_phnum * ehdr->e_phentsize;
     INFO("Section offsets will start from %lld.\n", lastoffset);
 
     int start = 1, end = 1;