From 0aa45facd7fb8a314fe2522123d4761f21c1b70e Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Tue, 4 Jan 2011 21:46:06 +0000 Subject: [PATCH] * script-sections.cc (Sort_output_sections::operator()): Sort TLS sections before NOBITS sections. --- gold/ChangeLog | 5 +++++ gold/script-sections.cc | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 7a5b89d1a65..ef9771f2e8d 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2011-01-04 Cary Coutant + + * script-sections.cc (Sort_output_sections::operator()): Sort TLS + sections before NOBITS sections. + 2011-01-01 H.J. Lu * version.cc (print_version): Update copyright to 2011. diff --git a/gold/script-sections.cc b/gold/script-sections.cc index 7bcf91cb7e2..bdbd811ebba 100644 --- a/gold/script-sections.cc +++ b/gold/script-sections.cc @@ -1,6 +1,6 @@ // 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 . // This file is part of gold. @@ -3586,17 +3586,18 @@ Sort_output_sections::operator()(const Output_section* os1, if (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 tls2 = (os2->flags() & elfcpp::SHF_TLS) != 0; if (tls1 != tls2) - return 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; + return nobits1 ? tls1 : tls2; // Sort non-NOLOAD before NOLOAD. if (os1->is_noload() && !os2->is_noload()) -- 2.30.2