espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 18:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

* script-sections.cc (Sort_output_sections::operator()): Sort TLS

Browse Source 
sections before NOBITS sections.
This commit is contained in:
Cary Coutant
2011-01-04 21:46:06 +00:00
parent cb21baef77
commit 0aa45facd7
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-04 Cary Coutant <ccoutant@google.com>
* script-sections.cc (Sort_output_sections::operator()): Sort TLS
sections before NOBITS sections.
2011-01-01 H.J. Lu <hongjiu.lu@intel.com> 2011-01-01 H.J. Lu <hongjiu.lu@intel.com>
* version.cc (print_version): Update copyright to 2011. * version.cc (print_version): Update copyright to 2011.

19
gold/script-sections.cc
View File

@ -1,6 +1,6 @@
// script-sections.cc -- linker script SECTIONS for gold // script-sections.cc -- linker script SECTIONS for gold
// Copyright 2008, 2009, 2010 Free Software Foundation, Inc. // Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>. // Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold. // This file is part of gold.
@ -3586,17 +3586,18 @@ Sort_output_sections::operator()(const Output_section* os1,
if (os1->address() != os2->address()) if (os1->address() != os2->address())
return os1->address() < os2->address(); return os1->address() < os2->address();
// Sort TLS sections to the end. // Sort PROGBITS before NOBITS.
bool nobits1 = os1->type() == elfcpp::SHT_NOBITS;
bool nobits2 = os2->type() == elfcpp::SHT_NOBITS;
if (nobits1 != nobits2)
return nobits2;
// Sort PROGBITS TLS sections to the end, NOBITS TLS sections to the
// beginning.
bool tls1 = (os1->flags() & elfcpp::SHF_TLS) != 0; bool tls1 = (os1->flags() & elfcpp::SHF_TLS) != 0;
bool tls2 = (os2->flags() & elfcpp::SHF_TLS) != 0; bool tls2 = (os2->flags() & elfcpp::SHF_TLS) != 0;
if (tls1 != tls2) if (tls1 != tls2)
return tls2; return nobits1 ? tls1 : tls2;
// Sort PROGBITS before NOBITS.
if (os1->type() == elfcpp::SHT_PROGBITS && os2->type() == elfcpp::SHT_NOBITS)
return true;
if (os1->type() == elfcpp::SHT_NOBITS && os2->type() == elfcpp::SHT_PROGBITS)
return false;
// Sort non-NOLOAD before NOLOAD. // Sort non-NOLOAD before NOLOAD.
if (os1->is_noload() && !os2->is_noload()) if (os1->is_noload() && !os2->is_noload())