From: Alan Modra <amodra@gmail.com>
Date: Thu, 21 Mar 2013 04:52:55 +0000 (+0000)
Subject: 	* layout.cc (Layout::set_segment_offsets): Accept writable .text
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebacd51e16144e7e88e8c010b571d94a9d7ea232;p=binutils-gdb.git

	* layout.cc (Layout::set_segment_offsets): Accept writable .text
	segment when omagic.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 52c2067e101..49ed9345a6b 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-21  Alan Modra  <amodra@gmail.com>
+
+	* layout.cc (Layout::set_segment_offsets): Accept writable .text
+	segment when omagic.
+
 2013-03-21  Alan Modra  <amodra@gmail.com>
 
 	* dwp.cc (Dwp_output_file::add_contribution): Avoid signed/unsigned
diff --git a/gold/layout.cc b/gold/layout.cc
index 4c48c3c4bb6..8b88deaa43d 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -3353,7 +3353,8 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
 	      addr = (*p)->paddr();
 	    }
 	  else if (parameters->options().user_set_Ttext()
-		   && ((*p)->flags() & elfcpp::PF_W) == 0)
+		   && (parameters->options().omagic()
+		       || ((*p)->flags() & elfcpp::PF_W) == 0))
 	    {
 	      are_addresses_set = true;
 	    }