* elf32-mips.c (mips_elf_final_link): Don't set CPIC when doing a

relocateable link.  From Ralf Baechle <ralf@uni-koblenz.de>.
This commit is contained in:
Ian Lance Taylor 1999-06-30 18:16:46 +00:00
parent 04f7c78d64
commit 0dda5f7af8
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
1999-06-30 Ian Lance Taylor <ian@zembu.com>
* elf32-mips.c (mips_elf_final_link): Don't set CPIC when doing a
relocateable link. From Ralf Baechle <ralf@uni-koblenz.de>.
1999-06-04 Philip Blundell <philb@gnu.org>
* elf32-arm.h (elf_backend_got_header_size): Define.

View File

@ -4175,11 +4175,12 @@ mips_elf_final_link (abfd, info)
/* If all the things we linked together were PIC, but we're
producing an executable (rather than a shared object), then the
resulting file is CPIC (i.e., it calls PIC code.) */
if (!info->shared && elf_elfheader (abfd)->e_flags & EF_MIPS_PIC)
if (!info->shared
&& !info->relocateable
&& elf_elfheader (abfd)->e_flags & EF_MIPS_PIC)
{
elf_elfheader (abfd)->e_flags &= ~EF_MIPS_PIC;
elf_elfheader (abfd)->e_flags |= EF_MIPS_CPIC;
}
/* On IRIX5, we omit the .options section. On IRIX6, however, we