Count size relocation as PC-relative relocation

bfd/

	* elf32-i386.c (elf_i386_check_relocs): Count size relocation as
	PC-relative relocation.
	* elf64-x86-64.c (elf_x86_64_check_relocs): Count size relocation
	as PC-relative relocation.

ld/testsuite/

	* ld-size/size32-3-i386.d: New file.
	* ld-size/size32-3-x32.d: Likewise.
	* ld-size/size32-3-x86-64.d: Likewise.
	* ld-size/size32-3.s: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f75e04655461db8f79b118ecd66a60c53fa1eaa2..30fead2c1f9b7d8025769707eeeeebb57bf7c820 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf32-i386.c (elf_i386_check_relocs): Count size relocation as
+       PC-relative relocation.
+       * elf64-x86-64.c (elf_x86_64_check_relocs): Count size relocation
+       as PC-relative relocation.
+
 2013-01-16  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf32-i386.c (elf_i386_check_relocs): Update R_386_SIZE32

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 9c061baea7093367d1598cb731300f5a100ec6aa..f8ad1d1c1fccf7e32a2f7b2f88cabc8038629061 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1454,6 +1454,7 @@ elf_i386_check_relocs (bfd *abfd,
       struct elf_link_hash_entry *h;
       Elf_Internal_Sym *isym;
       const char *name;
+      bfd_boolean size_reloc;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);
@@ -1557,6 +1558,7 @@ elf_i386_check_relocs (bfd *abfd,
          break;
 
        case R_386_SIZE32:
+         size_reloc = TRUE;
          goto do_size;
 
        case R_386_TLS_IE_32:
@@ -1706,6 +1708,7 @@ elf_i386_check_relocs (bfd *abfd,
                h->pointer_equality_needed = 1;
            }
 
+         size_reloc = FALSE;
 do_size:
          /* If we are creating a shared library, and this is a reloc
             against a global symbol, or a non PC relative reloc
@@ -1803,7 +1806,8 @@ do_size:
                }
 
              p->count += 1;
-             if (r_type == R_386_PC32)
+             /* Count size relocation as PC-relative relocation.  */
+             if (r_type == R_386_PC32 || size_reloc)
                p->pc_count += 1;
            }
          break;

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index c26060600b24cb9124465962a48ced2895b2c215..79b6dc606071aa2281ab6ff90acd0228f6591d66 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1424,6 +1424,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
       struct elf_link_hash_entry *h;
       Elf_Internal_Sym *isym;
       const char *name;
+      bfd_boolean size_reloc;
 
       r_symndx = htab->r_sym (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);
@@ -1708,6 +1709,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
 
        case R_X86_64_SIZE32:
        case R_X86_64_SIZE64:
+         size_reloc = TRUE;
          goto do_size;
 
        case R_X86_64_32:
@@ -1759,6 +1761,7 @@ pointer:
                h->pointer_equality_needed = 1;
            }
 
+         size_reloc = FALSE;
 do_size:
          /* If we are creating a shared library, and this is a reloc
             against a global symbol, or a non PC relative reloc
@@ -1860,7 +1863,8 @@ do_size:
                }
 
              p->count += 1;
-             if (IS_X86_64_PCREL_TYPE (r_type))
+             /* Count size relocation as PC-relative relocation.  */
+             if (IS_X86_64_PCREL_TYPE (r_type) || size_reloc)
                p->pc_count += 1;
            }
          break;

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c578fb681f1a4c755891fd817fdbea0e990fbd98..b6d521498cc28b04c9bbefb461a637f2ad6eeb0e 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ld-size/size32-3-i386.d: New file.
+       * ld-size/size32-3-x32.d: Likewise.
+       * ld-size/size32-3-x86-64.d: Likewise.
+       * ld-size/size32-3.s: Likewise.
+
 2013-01-16  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ld-size/size.exp: New file.