71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/bfd/ChangeLog bfd/ChangeLog
71be162
*** ../binutils-2.20.51.0.2.copy-patched/bfd/ChangeLog	2010-03-04 09:15:22.000000000 +0000
71be162
--- bfd/ChangeLog	2010-03-04 10:37:24.000000000 +0000
71be162
***************
71be162
*** 1,3 ****
71be162
--- 1,11 ----
71be162
+ 2010-02-18  H.J. Lu  <hongjiu.lu@intel.com>
71be162
+ 
71be162
+ 	* elf32-i386.c (elf_i386_add_symbol_hook): Don't set
71be162
+ 	has_ifunc_symbols if the symbol comes from a shared library.
71be162
+ 	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
71be162
+ 	* elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise.
71be162
+ 	* elf64-x86-64.c (elf64_x86_64_add_symbol_hook): Likewise.
71be162
+ 
71be162
  2009-12-17  Alan Modra  <amodra@bigpond.net.au>
71be162
  
71be162
  	PR ld/11088
71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/bfd/elf32-i386.c bfd/elf32-i386.c
71be162
*** ../binutils-2.20.51.0.2.copy-patched/bfd/elf32-i386.c	2010-03-04 09:15:19.000000000 +0000
71be162
--- bfd/elf32-i386.c	2010-03-04 10:37:39.000000000 +0000
71be162
*************** elf_i386_add_symbol_hook (bfd * abfd ATT
71be162
*** 4613,4619 ****
71be162
  			  asection ** secp ATTRIBUTE_UNUSED,
71be162
  			  bfd_vma * valp ATTRIBUTE_UNUSED)
71be162
  {
71be162
!   if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
71be162
      elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
  
71be162
    return _bfd_elf_add_sharable_symbol (abfd, info, sym, namep, flagsp,
71be162
--- 4613,4620 ----
71be162
  			  asection ** secp ATTRIBUTE_UNUSED,
71be162
  			  bfd_vma * valp ATTRIBUTE_UNUSED)
71be162
  {
71be162
!   if ((abfd->flags & DYNAMIC) == 0
71be162
!       && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
71be162
      elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
  
71be162
    return _bfd_elf_add_sharable_symbol (abfd, info, sym, namep, flagsp,
71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/bfd/elf32-ppc.c bfd/elf32-ppc.c
71be162
*** ../binutils-2.20.51.0.2.copy-patched/bfd/elf32-ppc.c	2010-03-04 09:15:20.000000000 +0000
71be162
--- bfd/elf32-ppc.c	2010-03-04 10:38:02.000000000 +0000
71be162
*************** ppc_elf_add_symbol_hook (bfd *abfd,
71be162
*** 3133,3139 ****
71be162
        *valp = sym->st_size;
71be162
      }
71be162
  
71be162
!   if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
71be162
      elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
  
71be162
    return TRUE;
71be162
--- 3133,3140 ----
71be162
        *valp = sym->st_size;
71be162
      }
71be162
  
71be162
!   if ((abfd->flags & DYNAMIC) == 0
71be162
!       && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
71be162
      elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
  
71be162
    return TRUE;
71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/bfd/elf64-ppc.c bfd/elf64-ppc.c
71be162
*** ../binutils-2.20.51.0.2.copy-patched/bfd/elf64-ppc.c	2010-03-04 09:15:20.000000000 +0000
71be162
--- bfd/elf64-ppc.c	2010-03-04 10:38:32.000000000 +0000
71be162
*************** ppc64_elf_add_symbol_hook (bfd *ibfd ATT
71be162
*** 4531,4537 ****
71be162
  			   bfd_vma *value ATTRIBUTE_UNUSED)
71be162
  {
71be162
    if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
71be162
!     elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
    else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC)
71be162
      ;
71be162
    else if (*sec != NULL
71be162
--- 4531,4540 ----
71be162
  			   bfd_vma *value ATTRIBUTE_UNUSED)
71be162
  {
71be162
    if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
71be162
!     {
71be162
!       if ((ibfd->flags & DYNAMIC) == 0)
71be162
! 	elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
!     }
71be162
    else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC)
71be162
      ;
71be162
    else if (*sec != NULL
71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/bfd/elf64-x86-64.c bfd/elf64-x86-64.c
71be162
*** ../binutils-2.20.51.0.2.copy-patched/bfd/elf64-x86-64.c	2010-03-04 09:15:21.000000000 +0000
71be162
--- bfd/elf64-x86-64.c	2010-03-04 10:38:50.000000000 +0000
71be162
*************** elf64_x86_64_add_symbol_hook (bfd *abfd,
71be162
*** 4242,4248 ****
71be162
        return TRUE;
71be162
      }
71be162
  
71be162
!   if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
71be162
      elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
  
71be162
    return _bfd_elf_add_sharable_symbol (abfd, info, sym, namep, flagsp,
71be162
--- 4242,4249 ----
71be162
        return TRUE;
71be162
      }
71be162
  
71be162
!   if ((abfd->flags & DYNAMIC) == 0
71be162
!       && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
71be162
      elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
71be162
  
71be162
    return _bfd_elf_add_sharable_symbol (abfd, info, sym, namep, flagsp,
71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/ld/testsuite/ChangeLog ld/testsuite/ChangeLog
71be162
*** ../binutils-2.20.51.0.2.copy-patched/ld/testsuite/ChangeLog	2010-03-04 09:16:17.000000000 +0000
71be162
--- ld/testsuite/ChangeLog	2010-03-04 11:43:29.000000000 +0000
71be162
***************
71be162
*** 1,3 ****
71be162
--- 1,8 ----
71be162
+ 2010-02-18  H.J. Lu  <hongjiu.lu@intel.com>
71be162
+ 
71be162
+ 	* ld-ifunc/ifunc.exp: Expect System V OSABI in dynamic
71be162
+ 	ifunc-using executable.
71be162
+ 
71be162
  2009-10-09  H.J. Lu  <hongjiu.lu@intel.com>
71be162
  
71be162
  	PR ld/10749
71be162
diff -rcp ../binutils-2.20.51.0.2.copy-patched/ld/testsuite/ld-ifunc/ifunc.exp ld/testsuite/ld-ifunc/ifunc.exp
71be162
*** ../binutils-2.20.51.0.2.copy-patched/ld/testsuite/ld-ifunc/ifunc.exp	2010-03-04 09:16:08.000000000 +0000
71be162
--- ld/testsuite/ld-ifunc/ifunc.exp	2010-03-04 11:44:15.000000000 +0000
71be162
*************** if {! [check_osabi tmpdir/static_prog {U
71be162
*** 257,264 ****
71be162
      fail "Static ifunc-using executable does not have an OS/ABI field of LINUX"
71be162
      set fails [expr $fails + 1]
71be162
  }
71be162
! if {! [check_osabi tmpdir/dynamic_prog {UNIX - Linux}]} {
71be162
!     fail "Dynamic ifunc-using executable does not have an OS/ABI field of LINUX"
71be162
      set fails [expr $fails + 1]
71be162
  }
71be162
  if {! [check_osabi tmpdir/static_nonifunc_prog {UNIX - System V}]} {
71be162
--- 257,264 ----
71be162
      fail "Static ifunc-using executable does not have an OS/ABI field of LINUX"
71be162
      set fails [expr $fails + 1]
71be162
  }
71be162
! if {! [check_osabi tmpdir/dynamic_prog {UNIX - System V}]} {
71be162
!     fail "Dynamic ifunc-using executable does not have an OS/ABI field of System V"
71be162
      set fails [expr $fails + 1]
71be162
  }
71be162
  if {! [check_osabi tmpdir/static_nonifunc_prog {UNIX - System V}]} {