From: Ian Lance Taylor <ian@airs.com>
Date: Sat, 18 Jun 2011 22:53:23 +0000 (+0000)
Subject: 	* layout.cc (Layout::finish_dynamic_section): Don't set DT_TEXTREL
X-Git-Tag: sid-snapshot-20110701~154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=766f91bb8935561d61b89b67bc90320f24ce8d95;p=platform%2Fupstream%2Fbinutils.git

	* layout.cc (Layout::finish_dynamic_section): Don't set DT_TEXTREL
	merely because a non-PT_LOAD segment has a dynamic reloc.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 3b79d95..ecf65f8 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,10 @@
 2011-06-18  Ian Lance Taylor  <iant@google.com>
 
+	* layout.cc (Layout::finish_dynamic_section): Don't set DT_TEXTREL
+	merely because a non-PT_LOAD segment has a dynamic reloc.
+
+2011-06-18  Ian Lance Taylor  <iant@google.com>
+
 	* layout.cc (Layout::finish_dynamic_section): Don't create
 	DT_FLAGS entry if not needed.
 
diff --git a/gold/layout.cc b/gold/layout.cc
index f74c626..6e69a92 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -4107,7 +4107,8 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
            p != this->segment_list_.end();
            ++p)
         {
-          if (((*p)->flags() & elfcpp::PF_W) == 0
+          if ((*p)->type() == elfcpp::PT_LOAD
+	      && ((*p)->flags() & elfcpp::PF_W) == 0
               && (*p)->has_dynamic_reloc())
             {
               have_textrel = true;
@@ -4127,7 +4128,7 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
         {
           if (((*p)->flags() & elfcpp::SHF_ALLOC) != 0
               && ((*p)->flags() & elfcpp::SHF_WRITE) == 0
-              && ((*p)->has_dynamic_reloc()))
+              && (*p)->has_dynamic_reloc())
             {
               have_textrel = true;
               break;