From 46a36ef7f3067aaf38ad76e4ff08a4ac1bd6b4bd Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 18 Jan 2011 20:41:07 +0000 Subject: [PATCH] Undo Solaris damages in elf64-x86-64.c. bfd/ 2011-01-18 H.J. Lu * elf64-x86-64.c (elf_backend_static_tls_alignment): Undefine after Solaris target. (elf_backend_want_plt_sym): Redefine to 0 after Solaris target. ld/testsuite/ 2011-01-18 H.J. Lu * ld-x86-64/ilp32-4.d: Updated. --- bfd/ChangeLog | 6 ++++++ bfd/elf64-x86-64.c | 6 ++++++ ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-x86-64/ilp32-4.d | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index eebb219f2..aef9a4479 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2011-01-18 H.J. Lu + + * elf64-x86-64.c (elf_backend_static_tls_alignment): Undefine + after Solaris target. + (elf_backend_want_plt_sym): Redefine to 0 after Solaris target. + 2011-01-18 Pierre Muller Fix compilation for mingw64. diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 9a3959ad1..0e441889a 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -4719,6 +4719,12 @@ elf64_l1om_elf_object_p (bfd *abfd) #undef elf_backend_post_process_headers #undef elf_backend_static_tls_alignment +/* Undo Solaris damages. */ +#undef elf_backend_static_tls_alignment + +#undef elf_backend_want_plt_sym +#define elf_backend_want_plt_sym 0 + #include "elf64-target.h" /* FreeBSD L1OM support. */ diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 678b54711..cfa3d33c4 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 H.J. Lu + + * ld-x86-64/ilp32-4.d: Updated. + 2011-01-17 Richard Sandiford * ld-arm/arm-rel32.s, ld-arm/arm-rel32.d: New testcase. diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d index e7bfe4e2f..e8690b345 100644 --- a/ld/testsuite/ld-x86-64/ilp32-4.d +++ b/ld/testsuite/ld-x86-64/ilp32-4.d @@ -15,8 +15,8 @@ Section Headers: \[ 5\] .text PROGBITS 00000160 000160 000005 00 AX 0 0 4 \[ 6\] .dynamic DYNAMIC 00200168 000168 000078 08 WA 3 0 4 \[ 7\] .shstrtab STRTAB 00000000 0001e0 00004a 00 0 0 1 - \[ 8\] .symtab SYMTAB 00000000 0003bc 0000f0 10 9 10 4 - \[ 9\] .strtab STRTAB 00000000 0004ac 00005d 00 0 0 1 + \[ 8\] .symtab SYMTAB 00000000 0003bc 0000e0 10 9 9 4 + \[ 9\] .strtab STRTAB 00000000 00049c 000043 00 0 0 1 Key to Flags: W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\) I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\) -- 2.11.4.GIT