From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 18 Jan 2011 20:41:09 +0000 (+0000)
Subject: Undo Solaris damages in elf64-x86-64.c.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a0c107f58d8b093835fbb69798e8fea6650664d;p=binutils-gdb.git

Undo Solaris damages in elf64-x86-64.c.

bfd/

2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>

	* 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  <hongjiu.lu@intel.com>

	* ld-x86-64/ilp32-4.d: Updated.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index eebb219f279..aef9a44796a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* 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  <muller@ics.u-strasbg.fr>
 
 	Fix compilation for mingw64.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 9a3959ad16c..0e441889ad5 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 678b547115d..cfa3d33c40d 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/ilp32-4.d: Updated.
+
 2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
 
 	* 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 e7bfe4e2fcc..e8690b34569 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\)