+2013-01-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elf32-i386.c (elf_i386_allocate_dynrelocs): Clear pc_count for
+ non-zero TLS symbol.
+ (elf_i386_relocate_section): Resolve size relocation against
+ non-zero TLS symbol.
+ * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Clear pc_count
+ for non-zero TLS symbol.
+ (elf_x86_64_relocate_section): Resolve size relocation against
+ non-zero TLS symbol.
+
2013-01-18 Mike Frysinger <vapier@gentoo.org>
* elflink.c (bfd_elf_size_dynamic_sections): Only add DT_RPATH
if (eh->dyn_relocs == NULL)
return TRUE;
+ /* Since pc_count for TLS symbol can only have size relocations and
+ we always resolve size relocation against non-zero TLS symbol, we
+ clear pc_count for non-zero TLS symbol. */
+ if (h->type == STT_TLS && h->size != 0)
+ {
+ struct elf_dyn_relocs **pp;
+
+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+ {
+ p->count -= p->pc_count;
+ p->pc_count = 0;
+ if (p->count == 0)
+ *pp = p->next;
+ else
+ pp = &p->next;
+ }
+ }
+
/* In the shared -Bsymbolic case, discard space allocated for
dynamic pc-relative relocs against symbols which turn out to be
defined in regular objects. For the normal shared case, discard
case R_386_SIZE32:
/* Set to symbol size. */
relocation = st_size;
+ if (h && h->type == STT_TLS && st_size != 0)
+ {
+ /* Resolve size relocation against non-zero TLS symbol. */
+ unresolved_reloc = FALSE;
+ break;
+ }
/* Fall through. */
case R_386_32:
if (eh->dyn_relocs == NULL)
return TRUE;
+ /* Since pc_count for TLS symbol can only have size relocations and
+ we always resolve size relocation against non-zero TLS symbol, we
+ clear pc_count for non-zero TLS symbol. */
+ if (h->type == STT_TLS && h->size != 0)
+ {
+ struct elf_dyn_relocs **pp;
+
+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+ {
+ p->count -= p->pc_count;
+ p->pc_count = 0;
+ if (p->count == 0)
+ *pp = p->next;
+ else
+ pp = &p->next;
+ }
+ }
+
/* In the shared -Bsymbolic case, discard space allocated for
dynamic pc-relative relocs against symbols which turn out to be
defined in regular objects. For the normal shared case, discard
case R_X86_64_SIZE64:
/* Set to symbol size. */
relocation = st_size;
+ if (h && h->type == STT_TLS && st_size != 0)
+ {
+ /* Resolve size relocation against non-zero TLS symbol. */
+ unresolved_reloc = FALSE;
+ break;
+ }
goto direct;
case R_X86_64_PC8:
+2013-01-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ * ld-size/size-10.rd: Updated.
+ * ld-size/size-8.rd: Likewise.
+ * ld-size/size32-2-i386.d: Likewise.
+ * ld-size/size32-2-x32.d: Likewise.
+ * ld-size/size32-2-x86-64.d: Likewise.
+ * ld-size/size64-2-x32.d: Likewise.
+ * ld-size/size64-2-x86-64.d: Likewise.
+
2013-01-17 H.J. Lu <hongjiu.lu@intel.com>
* ld-size/size-7.out: New file.
+#failif
+#...
+.* +R_.*_NONE +.*
#...
-[0-9a-f]+ +[0-9a-f]+ +R_.*_SIZE(32|64) +.*
-#pass
+#failif
+#...
+.* +R_.*_NONE +.*
#...
-[0-9a-f]+ +[0-9a-f]+ +R_.*_SIZE(32|64) +.*
-#pass
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0+123c R_386_SIZE32 xxx
-0+1240 R_386_SIZE32 yyy
-0+1244 R_386_SIZE32 zzz
-0+1248 R_386_SIZE32 zzz
-0+124c R_386_SIZE32 zzz
+0+1234 R_386_SIZE32 zzz
+0+1238 R_386_SIZE32 zzz
+0+123c R_386_SIZE32 zzz
Contents of section .data:
- 123c 00000000 00000000 00000000 e2ffffff ................
- 124c 1e000000 ....
+ 122c 28000000 28000000 00000000 e2ffffff ................
+ 123c 1e000000 ....
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0+200278 R_X86_64_SIZE32 xxx
-0+20027c R_X86_64_SIZE32 yyy
-0+200280 R_X86_64_SIZE32 zzz
-0+200284 R_X86_64_SIZE32 zzz-0x0000001e
-0+200288 R_X86_64_SIZE32 zzz\+0x0000001e
+0+200268 R_X86_64_SIZE32 zzz
+0+20026c R_X86_64_SIZE32 zzz-0x0000001e
+0+200270 R_X86_64_SIZE32 zzz\+0x0000001e
Contents of section .data:
- 200278 00000000 00000000 00000000 00000000 ................
- 200288 00000000 ....
+ 200260 28000000 28000000 00000000 00000000 ................
+ 200270 00000000 ....
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0+2003d8 R_X86_64_SIZE32 xxx
-0+2003dc R_X86_64_SIZE32 yyy
-0+2003e0 R_X86_64_SIZE32 zzz
-0+2003e4 R_X86_64_SIZE32 zzz-0x000000000000001e
-0+2003e8 R_X86_64_SIZE32 zzz\+0x000000000000001e
+0+2003b0 R_X86_64_SIZE32 zzz
+0+2003b4 R_X86_64_SIZE32 zzz-0x000000000000001e
+0+2003b8 R_X86_64_SIZE32 zzz\+0x000000000000001e
Contents of section .data:
- 2003d8 00000000 00000000 00000000 00000000 ................
- 2003e8 00000000 ....
+ 2003a8 28000000 28000000 00000000 00000000 ................
+ 2003b8 00000000 ....
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0+200278 R_X86_64_SIZE32 xxx
-0+200280 R_X86_64_SIZE32 yyy
-0+200288 R_X86_64_SIZE32 zzz
-0+200290 R_X86_64_SIZE64 zzz-0x0000001e
-0+200298 R_X86_64_SIZE64 zzz\+0x0000001e
+0+200270 R_X86_64_SIZE32 zzz
+0+200278 R_X86_64_SIZE64 zzz-0x0000001e
+0+200280 R_X86_64_SIZE64 zzz\+0x0000001e
Contents of section .data:
- 200278 00000000 00000000 00000000 00000000 ................
- 200288 00000000 00000000 00000000 00000000 ................
- 200298 00000000 00000000 ........
+ 200260 28000000 00000000 28000000 00000000 ................
+ 200270 00000000 00000000 00000000 00000000 ................
+ 200280 00000000 00000000 ........
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0+2003d8 R_X86_64_SIZE64 xxx
-0+2003e0 R_X86_64_SIZE64 yyy
-0+2003e8 R_X86_64_SIZE64 zzz
-0+2003f0 R_X86_64_SIZE64 zzz-0x000000000000001e
-0+2003f8 R_X86_64_SIZE64 zzz\+0x000000000000001e
+0+2003b8 R_X86_64_SIZE64 zzz
+0+2003c0 R_X86_64_SIZE64 zzz-0x000000000000001e
+0+2003c8 R_X86_64_SIZE64 zzz\+0x000000000000001e
Contents of section .data:
- 2003d8 00000000 00000000 00000000 00000000 ................
- 2003e8 00000000 00000000 00000000 00000000 ................
- 2003f8 00000000 00000000 ........
+ 2003a8 28000000 00000000 28000000 00000000 ................
+ 2003b8 00000000 00000000 00000000 00000000 ................
+ 2003c8 00000000 00000000 ........
projects / external / binutils.git / commitdiff