mereged changes to elf_object.cc

base/loader/elf_object.cc:
    merged changes to elf_object.cc

--HG--
extra : convert_revision : 2b7a6083d45f0221646e2ebe5b91ee45ec8c6b7c

diff --cc base/loader/elf_object.cc
index 93313fac6ebd101450e611ce09f955a03c0b666b,df3e15f7632bc45e451a2970f08d0afb3b09d486..929d455a57fca1974c9cdf8aab5fe02c2a4e9f77
--- 1/base/loader/elf_object.cc
--- 2/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@@ -183,10 -211,10 +183,10 @@@ ElfObject::loadSections(FunctionalMemor
  
  
  bool
 -ElfObject::loadGlobalSymbols(SymbolTable *symtab)
 +ElfObject::loadSomeSymbols(SymbolTable *symtab, int binding)
  {
      Elf *elf;
-     int secidx = 1; // there is a 0 but it is nothing, go figure
 -    int sec_idx = 1; /* there is a 0 but it is nothing, go figure*/
++    int sec_idx = 1; // there is a 0 but it is nothing, go figure
      Elf_Scn *section;
      GElf_Shdr shdr;
      Elf_Data *data;
@@@ -205,14 -233,18 +205,14 @@@
  
      assert(elf != NULL);
  
 -
 -    /* Get the first section */
 +    // Get the first section
-     section = elf_getscn(elf, secidx);
+     section = elf_getscn(elf, sec_idx);
  
 -    /* While there are no more sections */
 -    while (section != NULL)
 -    {
 +    // While there are no more sections
 +    while (section != NULL) {
          gelf_getshdr(section, &shdr);
  
 -
 -        if(shdr.sh_type == SHT_SYMTAB)
 -        {
 +        if (shdr.sh_type == SHT_SYMTAB) {
              found = true;
              data = elf_getdata(section, NULL);
              count = shdr.sh_size / shdr.sh_entsize;