This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: gold patch committed: Minor SPARC fixes
- From: Ian Lance Taylor <iant at google dot com>
- To: binutils at sourceware dot org
- Cc: David Miller <davem at davemloft dot net>
- Date: Tue, 17 Mar 2009 00:22:17 -0700
- Subject: Re: gold patch committed: Minor SPARC fixes
- References: <m3k56o8vj9.fsf@google.com>
Forgot the patch twice in a row. Time for bed.
Ian
Ian Lance Taylor <iant@google.com> writes:
> I committed this patch to gold for some minor SPARC fixes.
>
> If we see the _GLOBAL_OFFSET_TABLE_ symbol, then we need to have a GOT
> section. This is not done in a particularly efficient fashion, and
> there may be a better way to handle it.
>
> The R_SPARC_TLS_IE_ADD reloc is moderately useless, but gcc does
> generate it, and we have to recognize it.
>
> Ian
>
> 2009-03-17 Ian Lance Taylor <iant@google.com>
>
> * sparc.cc (class Target_sparc): Add has_got_section.
> (Target_sparc::Scan::global): If we see _GLOBAL_OFFSET_TABLE_,
> make sure we have a GOT section.
>
> * sparc.cc (optimize_tls_reloc): Recognize R_SPARC_TLS_IE_ADD.
> (Target_sparc::Scan::local): Likewise.
> (Target_sparc::Scan::global): Likewise.
> (Target_sparc::Relocate::relocate): Likewise.
> (Target_sparc::Relocate::relocate_tls): Likewise.
Index: sparc.cc
===================================================================
RCS file: /cvs/src/src/gold/sparc.cc,v
retrieving revision 1.13
diff -u -p -r1.13 sparc.cc
--- sparc.cc 4 Mar 2009 06:46:27 -0000 1.13
+++ sparc.cc 17 Mar 2009 07:15:36 -0000
@@ -155,6 +155,11 @@ class Target_sparc : public Sized_target
return strcmp(sym->name(), "___tls_get_addr") == 0;
}
+ // Return whether there is a GOT section.
+ bool
+ has_got_section() const
+ { return this->got_ != NULL; }
+
// Return the size of the GOT section.
section_size_type
got_size()
@@ -1455,6 +1460,7 @@ optimize_tls_reloc(bool is_final, int r_
case elfcpp::R_SPARC_TLS_IE_LO10:
case elfcpp::R_SPARC_TLS_IE_LD:
case elfcpp::R_SPARC_TLS_IE_LDX:
+ case elfcpp::R_SPARC_TLS_IE_ADD:
// These are Initial-Exec relocs which get the thread offset
// from the GOT. If we know that we are linking against the
// local symbol, we can switch to Local-Exec, which links the
@@ -1744,6 +1750,7 @@ Target_sparc<size, big_endian>::Scan::lo
case elfcpp::R_SPARC_TLS_IE_LO10:
case elfcpp::R_SPARC_TLS_IE_LD:
case elfcpp::R_SPARC_TLS_IE_LDX:
+ case elfcpp::R_SPARC_TLS_IE_ADD:
case elfcpp::R_SPARC_TLS_LE_HIX22: // Local-exec
case elfcpp::R_SPARC_TLS_LE_LOX10:
{
@@ -1810,6 +1817,7 @@ Target_sparc<size, big_endian>::Scan::lo
case elfcpp::R_SPARC_TLS_IE_LO10:
case elfcpp::R_SPARC_TLS_IE_LD:
case elfcpp::R_SPARC_TLS_IE_LDX:
+ case elfcpp::R_SPARC_TLS_IE_ADD:
layout->set_has_static_tls();
if (optimized_type == tls::TLSOPT_NONE)
{
@@ -1907,6 +1915,13 @@ Target_sparc<size, big_endian>::Scan::gl
{
unsigned int orig_r_type = r_type;
+ // A reference to _GLOBAL_OFFSET_TABLE_ implies that we need a got
+ // section. We check here to avoid creating a dynamic reloc against
+ // _GLOBAL_OFFSET_TABLE_.
+ if (!target->has_got_section()
+ && strcmp(gsym->name(), "_GLOBAL_OFFSET_TABLE_") == 0)
+ target->got_section(symtab, layout);
+
r_type &= 0xff;
switch (r_type)
{
@@ -2105,6 +2120,7 @@ Target_sparc<size, big_endian>::Scan::gl
case elfcpp::R_SPARC_TLS_IE_LO10:
case elfcpp::R_SPARC_TLS_IE_LD:
case elfcpp::R_SPARC_TLS_IE_LDX:
+ case elfcpp::R_SPARC_TLS_IE_ADD:
{
const bool is_final = gsym->final_value_is_known();
const tls::Tls_optimization optimized_type
@@ -2187,6 +2203,7 @@ Target_sparc<size, big_endian>::Scan::gl
case elfcpp::R_SPARC_TLS_IE_LO10:
case elfcpp::R_SPARC_TLS_IE_LD:
case elfcpp::R_SPARC_TLS_IE_LDX:
+ case elfcpp::R_SPARC_TLS_IE_ADD:
layout->set_has_static_tls();
if (optimized_type == tls::TLSOPT_NONE)
{
@@ -2460,8 +2477,8 @@ Target_sparc<size, big_endian>::Relocate
case elfcpp::R_SPARC_32:
if (!parameters->options().output_is_position_independent())
- Relocate_functions<size, big_endian>::rela32(view, object,
- psymval, addend);
+ Relocate_functions<size, big_endian>::rela32(view, object,
+ psymval, addend);
break;
case elfcpp::R_SPARC_DISP8:
@@ -2670,6 +2687,7 @@ Target_sparc<size, big_endian>::Relocate
case elfcpp::R_SPARC_TLS_IE_LO10:
case elfcpp::R_SPARC_TLS_IE_LD:
case elfcpp::R_SPARC_TLS_IE_LDX:
+ case elfcpp::R_SPARC_TLS_IE_ADD:
case elfcpp::R_SPARC_TLS_LE_HIX22:
case elfcpp::R_SPARC_TLS_LE_LOX10:
this->relocate_tls(relinfo, target, relnum, rela,
@@ -3049,6 +3067,12 @@ Target_sparc<size, big_endian>::Relocate
r_type);
break;
+ case elfcpp::R_SPARC_TLS_IE_ADD:
+ // This seems to be mainly so that we can find the addition
+ // instruction if there is one. There doesn't seem to be any
+ // actual relocation to apply.
+ break;
+
case elfcpp::R_SPARC_TLS_LE_HIX22:
// If we're creating a shared library, a dynamic relocation will
// have been created for this location, so do not apply it now.