merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:08 +0000 (09:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:08 +0000 (09:10 -0700)
Change-Id: I518bb4ae9d7269957365561d4d609f22cde519db

1  2 
linker/dlfcn.c
linker/linker.c

diff --cc linker/dlfcn.c
Simple merge
diff --cc linker/linker.c
index 6719b12210e5a76fe6e14b0a9e98b4155fe4539f,451e96c2b18af080ae463ce8ac688d20423857ff..a1f4fffb75a17398bf30eaef716c0a6738a62660
@@@ -509,9 -512,9 +509,9 @@@ Elf32_Sym *lookup_in_library(soinfo *si
  
  /* This is used by dl_sym().  It performs a global symbol lookup.
   */
- Elf32_Sym *lookup(const char *name, soinfo **found)
+ Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start)
  {
 -    unsigned elf_hash = 0;
 +    unsigned elf_hash = elfhash(name);
      Elf32_Sym *s = NULL;
      soinfo *si;