Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

PR 10979

Browse Source 
* layout.cc (Layout::relaxation_loop_body): If -Ttext was used,
	don't put the file header and segment headers in the text
	segment.
This commit is contained in:
Ian Lance Taylor
2009-12-31 05:43:29 +00:00
parent eda294df6d
commit 403a15dd3b
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@@ -1,5 +1,10 @@
2009-12-30 Ian Lance Taylor <iant@google.com> 2009-12-30 Ian Lance Taylor <iant@google.com>
PR 10979
* layout.cc (Layout::relaxation_loop_body): If -Ttext was used,
don't put the file header and segment headers in the text
segment.
PR 10979 PR 10979
* common.cc (Sort_commons::operator()): Stabilize sort when both * common.cc (Sort_commons::operator()): Stabilize sort when both
entries are NULL. entries are NULL.

6
gold/layout.cc
View File

@@ -1482,6 +1482,12 @@ Layout::relaxation_loop_body(
!= General_options::OBJECT_FORMAT_ELF) != General_options::OBJECT_FORMAT_ELF)
load_seg = NULL; load_seg = NULL;
// If the user set the address of the text segment, that may not be
// compatible with putting the segment headers and file headers into
// that segment.
if (parameters->options().user_set_Ttext())
load_seg = NULL;
gold_assert(phdr_seg == NULL gold_assert(phdr_seg == NULL
|| load_seg != NULL || load_seg != NULL
|| this->script_options_->saw_sections_clause()); || this->script_options_->saw_sections_clause());