From: amodra <amodra>
Date: Sat, 8 Sep 2007 11:04:28 +0000 (+0000)
Subject: 	* ldwrite.c (build_link_order <lang_padding_statement_enum>): Correct
X-Git-Tag: EOL_registry_mounts~2614
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a8a8086aee981c8d9265b01c3193cf6d93502a35;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* ldwrite.c (build_link_order <lang_padding_statement_enum>): Correct
	condition under which we build a bfd_data_link_order.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1579bec8b6..2ffe3976dc 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* ldwrite.c (build_link_order <lang_padding_statement_enum>): Correct
+	condition under which we build a bfd_data_link_order.
+
 2007-08-31  Tristan Gingold  <gingold@adacore.com>
 
 	* ldlang.c (lang_map): Increment lang_statement_iteration so that
diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index 47e8f642f8..0f45a91605 100644
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -270,7 +270,10 @@ build_link_order (lang_statement_union_type *statement)
 	output_section = statement->padding_statement.output_section;
 	ASSERT (statement->padding_statement.output_section->owner
 		== output_bfd);
-	if ((output_section->flags & SEC_HAS_CONTENTS) != 0)
+	if (((output_section->flags & SEC_HAS_CONTENTS) != 0
+	     || ((output_section->flags & SEC_LOAD) != 0
+		 && (output_section->flags & SEC_THREAD_LOCAL)))
+	    && (output_section->flags & SEC_NEVER_LOAD) == 0)
 	  {
 	    link_order = bfd_new_link_order (output_bfd, output_section);
 	    link_order->type = bfd_data_link_order;