2005-01-24 H.J. Lu <hongjiu.lu@intel.com> PR 584 * elf64-x86-64.c (is_32bit_relative_branch): New. (elf64_x86_64_relocate_section): Alllow R_X86_64_PC32 on a protected function symbol when building shared library for 32bit relative branch instruction. --- binutils-2.15.92.0.2/bfd/elf64-x86-64.c.x86_64-visibility-protected 2004-09-27 16:46:06.000000000 -0400 +++ binutils-2.15.92.0.2/bfd/elf64-x86-64.c 2005-02-01 16:49:40.244299913 -0500 @@ -1741,6 +1741,24 @@ tpoff (struct bfd_link_info *info, bfd_v return address - htab->tls_size - htab->tls_sec->vma; } +/* Is the instruction before OFFSET in CONTENTS a 32bit relative + branch? */ + +static bfd_boolean +is_32bit_relative_branch (bfd_byte *contents, bfd_vma offset) +{ + /* Opcode Instruction + 0xe8 call + 0xe9 jump + 0x0f 0x8x conditional jump */ + return ((offset > 0 + && (contents [offset - 1] == 0xe8 + || contents [offset - 1] == 0xe9)) + || (offset > 1 + && contents [offset - 2] == 0x0f + && (contents [offset - 1] & 0xf0) == 0x80)); +} + /* Relocate an x86_64 ELF section. */ static bfd_boolean @@ -1946,13 +1964,26 @@ elf64_x86_64_relocate_section (bfd *outp if (info->shared && !SYMBOL_REFERENCES_LOCAL (info, h) && (input_section->flags & SEC_ALLOC) != 0 - && (input_section->flags & SEC_READONLY) != 0) + && (input_section->flags & SEC_READONLY) != 0 + && (!h->def_regular + || r_type != R_X86_64_PC32 + || h->type != STT_FUNC + || ELF_ST_VISIBILITY (h->other) != STV_PROTECTED + || !is_32bit_relative_branch (contents, + rel->r_offset))) { - (*_bfd_error_handler) - (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"), - input_bfd, - x86_64_elf_howto_table[r_type].name, - (h) ? h->root.root.string : "a local symbol"); + if (h->def_regular + && r_type == R_X86_64_PC32 + && h->type == STT_FUNC + && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED) + (*_bfd_error_handler) + (_("%B: relocation R_X86_64_PC32 against protected function `%s' can not be used when making a shared object"), + input_bfd, h->root.root.string); + else + (*_bfd_error_handler) + (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"), + input_bfd, x86_64_elf_howto_table[r_type].name, + h->root.root.string); bfd_set_error (bfd_error_bad_value); return FALSE; }