From ca72342916da6d50527a3408e8c17f8320431409 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 20 Jun 2006 16:36:18 +0000
Subject: [PATCH] 	* elflink.c (elf_link_add_object_symbols): Don't
 create .tcommon 	section for relocatable link.

	* ld-elf/tls_common.exp: New test.
	* ld-elf/tls_common.s: New file.
---
 bfd/ChangeLog                      |  5 +++
 bfd/elflink.c                      |  3 +-
 ld/testsuite/ChangeLog             |  5 +++
 ld/testsuite/ld-elf/tls_common.exp | 70 ++++++++++++++++++++++++++++++++++++++
 ld/testsuite/ld-elf/tls_common.s   | 11 ++++++
 5 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 ld/testsuite/ld-elf/tls_common.exp
 create mode 100644 ld/testsuite/ld-elf/tls_common.s

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b6996a868..8b3268548 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (elf_link_add_object_symbols): Don't create .tcommon
+	section for relocatable link.
+
 2006-06-21  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf-bfd.h (struct elf_backend_data): Add
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 0a3296336..4b20749e1 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -3621,7 +3621,8 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
 	goto error_free_vers;
 
       if (isym->st_shndx == SHN_COMMON
-	  && ELF_ST_TYPE (isym->st_info) == STT_TLS)
+	  && ELF_ST_TYPE (isym->st_info) == STT_TLS
+	  && !info->relocatable)
 	{
 	  asection *tcomm = bfd_get_section_by_name (abfd, ".tcommon");
 
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d8ef44b77..f8faba82b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* ld-elf/tls_common.exp: New test.
+	* ld-elf/tls_common.s: New file.
+
 2006-06-20  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-elf/eh1.d: Update for fewer program headers.
diff --git a/ld/testsuite/ld-elf/tls_common.exp b/ld/testsuite/ld-elf/tls_common.exp
new file mode 100644
index 000000000..1a53f8ade
--- /dev/null
+++ b/ld/testsuite/ld-elf/tls_common.exp
@@ -0,0 +1,70 @@
+# Expect script for .tls_common tests
+#   Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Written by Jakub Jelinek (jakub@redhat.com)
+#
+
+# Make sure that binutils can correctly handle ld output in ELF.
+
+# Run on Linux only.
+if { ![istarget *-*-linux*] } {
+    return
+}
+
+if { [istarget *-*-linux*aout*]
+     || [istarget *-*-linux*oldld*] } {
+    return
+}
+
+global as
+global ld
+global READELF
+global srcdir
+global subdir
+global link_output
+
+if { ![ld_assemble $as $srcdir/$subdir/tls_common.s tmpdir/tls_common.o ] } {
+    unresolved "tls_common"
+    return
+}
+
+if { ![ld_simple_link $ld tmpdir/tls_common1.o "-r tmpdir/tls_common.o"] } {
+    fail "tls_common"
+    return
+}
+
+if { ![ld_simple_link $ld tmpdir/tls_common "tmpdir/tls_common1.o"] } {
+    if { [string match "*not supported*" $link_output]
+	 || [string match "*unrecognized option*" $link_output] } {
+	unsupported "$ld_options is not supported by this target"
+    } elseif { [string match "*Warning*alignment*of common symbol*" $link_output] } {
+	fail "tls_common"
+    } else {
+	unresolved "tls_common"
+    }
+    return
+} 
+
+send_log "$READELF -l --wide tmpdir/tls_common\n"
+catch "exec $READELF -l --wide tmpdir/tls_common" readelf_output
+if ![string match "*TLS*0x000000 0x000004 R *" $readelf_output] then {
+    send_log "$readelf_output\n"
+    fail "tls_common"
+    return
+}
+
+pass "tls_common"
diff --git a/ld/testsuite/ld-elf/tls_common.s b/ld/testsuite/ld-elf/tls_common.s
new file mode 100644
index 000000000..502d8f310
--- /dev/null
+++ b/ld/testsuite/ld-elf/tls_common.s
@@ -0,0 +1,11 @@
+	.globl main
+	.globl start
+	.globl _start
+	.globl __start
+	.text
+main:
+start:
+_start:
+__start:
+	.byte 0
+	.tls_common	foo,4,4
-- 
2.11.4.GIT