2006-09-30 03:58:17 +08:00
|
|
|
// reloc.cc -- relocate input files for gold.
|
|
|
|
|
2022-01-02 06:30:17 +08:00
|
|
|
// Copyright (C) 2006-2022 Free Software Foundation, Inc.
|
2007-09-23 05:02:10 +08:00
|
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
|
|
|
|
// This file is part of gold.
|
|
|
|
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
|
|
// along with this program; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
// MA 02110-1301, USA.
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "gold.h"
|
|
|
|
|
2008-01-03 07:48:49 +08:00
|
|
|
#include <algorithm>
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "workqueue.h"
|
2010-08-13 06:01:11 +08:00
|
|
|
#include "layout.h"
|
2006-12-01 07:52:50 +08:00
|
|
|
#include "symtab.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "output.h"
|
2007-12-22 05:19:45 +08:00
|
|
|
#include "merge.h"
|
|
|
|
#include "object.h"
|
2008-02-28 06:38:18 +08:00
|
|
|
#include "target-reloc.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "reloc.h"
|
2009-10-14 05:17:43 +08:00
|
|
|
#include "icf.h"
|
2010-07-13 01:59:58 +08:00
|
|
|
#include "compressed_output.h"
|
2010-08-13 06:01:11 +08:00
|
|
|
#include "incremental.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Read_relocs methods.
|
|
|
|
|
|
|
|
// These tasks just read the relocation information from the file.
|
|
|
|
// After reading it, the start another task to process the
|
|
|
|
// information. These tasks requires access to the file.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
Read_relocs::is_runnable()
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->object_->is_locked() ? this->object_->token() : NULL;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Lock the file.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
Read_relocs::locks(Task_locker* tl)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2011-04-12 08:44:48 +08:00
|
|
|
Task_token* token = this->object_->token();
|
|
|
|
if (token != NULL)
|
|
|
|
tl->add(this, token);
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Read the relocations and then start a Scan_relocs_task.
|
|
|
|
|
|
|
|
void
|
|
|
|
Read_relocs::run(Workqueue* workqueue)
|
|
|
|
{
|
2010-08-25 16:36:54 +08:00
|
|
|
Read_relocs_data* rd = new Read_relocs_data;
|
2006-10-21 04:40:49 +08:00
|
|
|
this->object_->read_relocs(rd);
|
2009-01-28 10:25:33 +08:00
|
|
|
this->object_->set_relocs_data(rd);
|
2007-12-15 03:00:21 +08:00
|
|
|
this->object_->release();
|
|
|
|
|
2009-08-06 04:51:56 +08:00
|
|
|
// If garbage collection or identical comdat folding is desired, we
|
|
|
|
// process the relocs first before scanning them. Scanning of relocs is
|
|
|
|
// done only after garbage or identical sections is identified.
|
2009-10-14 05:17:43 +08:00
|
|
|
if (parameters->options().gc_sections()
|
|
|
|
|| parameters->options().icf_enabled())
|
2009-08-06 04:51:56 +08:00
|
|
|
{
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
workqueue->queue_next(new Gc_process_relocs(this->symtab_,
|
2009-01-28 10:25:33 +08:00
|
|
|
this->layout_,
|
|
|
|
this->object_, rd,
|
2010-02-12 12:33:53 +08:00
|
|
|
this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
2009-01-28 10:25:33 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
workqueue->queue_next(new Scan_relocs(this->symtab_, this->layout_,
|
|
|
|
this->object_, rd,
|
2010-02-12 12:33:53 +08:00
|
|
|
this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
2009-01-28 10:25:33 +08:00
|
|
|
}
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
// Return a debugging name for the task.
|
|
|
|
|
|
|
|
std::string
|
|
|
|
Read_relocs::get_name() const
|
|
|
|
{
|
|
|
|
return "Read_relocs " + this->object_->name();
|
|
|
|
}
|
|
|
|
|
2009-01-28 10:25:33 +08:00
|
|
|
// Gc_process_relocs methods.
|
|
|
|
|
2010-02-12 12:33:53 +08:00
|
|
|
Gc_process_relocs::~Gc_process_relocs()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// These tasks process the relocations read by Read_relocs and
|
2009-01-28 10:25:33 +08:00
|
|
|
// determine which sections are referenced and which are garbage.
|
2010-02-12 12:33:53 +08:00
|
|
|
// This task is done only when --gc-sections is used. This is blocked
|
|
|
|
// by THIS_BLOCKER_. It unblocks NEXT_BLOCKER_.
|
2009-01-28 10:25:33 +08:00
|
|
|
|
|
|
|
Task_token*
|
|
|
|
Gc_process_relocs::is_runnable()
|
|
|
|
{
|
2010-02-12 12:33:53 +08:00
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
|
|
|
return this->this_blocker_;
|
2009-01-28 10:25:33 +08:00
|
|
|
if (this->object_->is_locked())
|
|
|
|
return this->object_->token();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Gc_process_relocs::locks(Task_locker* tl)
|
|
|
|
{
|
|
|
|
tl->add(this, this->object_->token());
|
2010-02-12 12:33:53 +08:00
|
|
|
tl->add(this, this->next_blocker_);
|
2009-01-28 10:25:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Gc_process_relocs::run(Workqueue*)
|
|
|
|
{
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
this->object_->gc_process_relocs(this->symtab_, this->layout_, this->rd_);
|
2009-01-28 10:25:33 +08:00
|
|
|
this->object_->release();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return a debugging name for the task.
|
|
|
|
|
|
|
|
std::string
|
|
|
|
Gc_process_relocs::get_name() const
|
|
|
|
{
|
|
|
|
return "Gc_process_relocs " + this->object_->name();
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Scan_relocs methods.
|
|
|
|
|
2010-02-12 12:33:53 +08:00
|
|
|
Scan_relocs::~Scan_relocs()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// These tasks scan the relocations read by Read_relocs and mark up
|
|
|
|
// the symbol table to indicate which relocations are required. We
|
|
|
|
// use a lock on the symbol table to keep them from interfering with
|
|
|
|
// each other.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
Scan_relocs::is_runnable()
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2010-02-12 12:33:53 +08:00
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
|
|
|
return this->this_blocker_;
|
2007-12-15 03:00:21 +08:00
|
|
|
if (this->object_->is_locked())
|
|
|
|
return this->object_->token();
|
|
|
|
return NULL;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return the locks we hold: one on the file, one on the symbol table
|
|
|
|
// and one blocker.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
Scan_relocs::locks(Task_locker* tl)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2011-04-12 08:44:48 +08:00
|
|
|
Task_token* token = this->object_->token();
|
|
|
|
if (token != NULL)
|
|
|
|
tl->add(this, token);
|
2010-02-12 12:33:53 +08:00
|
|
|
tl->add(this, this->next_blocker_);
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Scan the relocs.
|
|
|
|
|
|
|
|
void
|
|
|
|
Scan_relocs::run(Workqueue*)
|
|
|
|
{
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
this->object_->scan_relocs(this->symtab_, this->layout_, this->rd_);
|
2006-10-21 04:40:49 +08:00
|
|
|
delete this->rd_;
|
|
|
|
this->rd_ = NULL;
|
2010-03-11 01:37:11 +08:00
|
|
|
this->object_->release();
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
// Return a debugging name for the task.
|
|
|
|
|
|
|
|
std::string
|
|
|
|
Scan_relocs::get_name() const
|
|
|
|
{
|
|
|
|
return "Scan_relocs " + this->object_->name();
|
|
|
|
}
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Relocate_task methods.
|
|
|
|
|
2007-11-09 15:00:15 +08:00
|
|
|
// We may have to wait for the output sections to be written.
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
Relocate_task::is_runnable()
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2007-11-09 15:00:15 +08:00
|
|
|
if (this->object_->relocs_must_follow_section_writes()
|
|
|
|
&& this->output_sections_blocker_->is_blocked())
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->output_sections_blocker_;
|
2007-11-09 15:00:15 +08:00
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
if (this->object_->is_locked())
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->object_->token();
|
2007-11-22 08:05:51 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
return NULL;
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// We want to lock the file while we run. We want to unblock
|
2007-11-09 15:00:15 +08:00
|
|
|
// INPUT_SECTIONS_BLOCKER and FINAL_BLOCKER when we are done.
|
2007-12-15 03:00:21 +08:00
|
|
|
// INPUT_SECTIONS_BLOCKER may be NULL.
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
Relocate_task::locks(Task_locker* tl)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2007-12-15 03:00:21 +08:00
|
|
|
if (this->input_sections_blocker_ != NULL)
|
|
|
|
tl->add(this, this->input_sections_blocker_);
|
|
|
|
tl->add(this, this->final_blocker_);
|
2011-04-12 08:44:48 +08:00
|
|
|
Task_token* token = this->object_->token();
|
|
|
|
if (token != NULL)
|
|
|
|
tl->add(this, token);
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Run the task.
|
|
|
|
|
|
|
|
void
|
|
|
|
Relocate_task::run(Workqueue*)
|
|
|
|
{
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
this->object_->relocate(this->symtab_, this->layout_, this->of_);
|
2008-01-03 07:48:49 +08:00
|
|
|
|
|
|
|
// This is normally the last thing we will do with an object, so
|
|
|
|
// uncache all views.
|
|
|
|
this->object_->clear_view_cache_marks();
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
this->object_->release();
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
// Return a debugging name for the task.
|
|
|
|
|
|
|
|
std::string
|
|
|
|
Relocate_task::get_name() const
|
|
|
|
{
|
|
|
|
return "Relocate_task " + this->object_->name();
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Read the relocs and local symbols from the object file and store
|
|
|
|
// the information in RD.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::do_read_relocs(Read_relocs_data* rd)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
|
|
|
rd->relocs.clear();
|
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned int shnum = this->shnum();
|
|
|
|
if (shnum == 0)
|
2006-10-21 04:40:49 +08:00
|
|
|
return;
|
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
rd->relocs.reserve(shnum / 2);
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2008-07-11 07:01:20 +08:00
|
|
|
const Output_sections& out_sections(this->output_sections());
|
2011-05-25 05:41:10 +08:00
|
|
|
const std::vector<Address>& out_offsets(this->section_offsets());
|
2007-11-09 15:00:15 +08:00
|
|
|
|
2010-08-25 16:36:54 +08:00
|
|
|
const unsigned char* pshdrs = this->get_view(this->elf_file_.shoff(),
|
2009-12-15 03:53:05 +08:00
|
|
|
shnum * This::shdr_size,
|
2008-04-03 04:58:21 +08:00
|
|
|
true, true);
|
2006-10-21 04:40:49 +08:00
|
|
|
// Skip the first, dummy, section.
|
2010-08-25 16:36:54 +08:00
|
|
|
const unsigned char* ps = pshdrs + This::shdr_size;
|
2009-12-15 03:53:05 +08:00
|
|
|
for (unsigned int i = 1; i < shnum; ++i, ps += This::shdr_size)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
|
|
|
typename This::Shdr shdr(ps);
|
|
|
|
|
|
|
|
unsigned int sh_type = shdr.get_sh_type();
|
|
|
|
if (sh_type != elfcpp::SHT_REL && sh_type != elfcpp::SHT_RELA)
|
|
|
|
continue;
|
|
|
|
|
2008-04-20 02:30:58 +08:00
|
|
|
unsigned int shndx = this->adjust_shndx(shdr.get_sh_info());
|
2009-12-15 03:53:05 +08:00
|
|
|
if (shndx >= shnum)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
this->error(_("relocation section %u has bad info %u"),
|
|
|
|
i, shndx);
|
|
|
|
continue;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
2008-07-11 07:01:20 +08:00
|
|
|
Output_section* os = out_sections[shndx];
|
2007-11-09 15:00:15 +08:00
|
|
|
if (os == NULL)
|
2006-10-21 04:40:49 +08:00
|
|
|
continue;
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// We are scanning relocations in order to fill out the GOT and
|
|
|
|
// PLT sections. Relocations for sections which are not
|
|
|
|
// allocated (typically debugging sections) should not add new
|
2008-02-06 16:13:50 +08:00
|
|
|
// GOT and PLT entries. So we skip them unless this is a
|
2009-03-04 14:46:27 +08:00
|
|
|
// relocatable link or we need to emit relocations. FIXME: What
|
|
|
|
// should we do if a linker script maps a section with SHF_ALLOC
|
|
|
|
// clear to a section with SHF_ALLOC set?
|
2008-02-28 06:38:18 +08:00
|
|
|
typename This::Shdr secshdr(pshdrs + shndx * This::shdr_size);
|
|
|
|
bool is_section_allocated = ((secshdr.get_sh_flags() & elfcpp::SHF_ALLOC)
|
|
|
|
!= 0);
|
|
|
|
if (!is_section_allocated
|
2008-02-28 08:18:24 +08:00
|
|
|
&& !parameters->options().relocatable()
|
2010-08-13 06:01:11 +08:00
|
|
|
&& !parameters->options().emit_relocs()
|
2010-10-15 06:10:22 +08:00
|
|
|
&& !parameters->incremental())
|
2008-02-28 06:38:18 +08:00
|
|
|
continue;
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2008-04-20 02:30:58 +08:00
|
|
|
if (this->adjust_shndx(shdr.get_sh_link()) != this->symtab_shndx_)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
this->error(_("relocation section %u uses unexpected "
|
|
|
|
"symbol table %u"),
|
2008-04-20 02:30:58 +08:00
|
|
|
i, this->adjust_shndx(shdr.get_sh_link()));
|
2007-10-14 14:49:14 +08:00
|
|
|
continue;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
off_t sh_size = shdr.get_sh_size();
|
|
|
|
|
2011-05-31 12:26:49 +08:00
|
|
|
if (sh_size == 0)
|
|
|
|
continue;
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned int reloc_size;
|
|
|
|
if (sh_type == elfcpp::SHT_REL)
|
|
|
|
reloc_size = elfcpp::Elf_sizes<size>::rel_size;
|
|
|
|
else
|
|
|
|
reloc_size = elfcpp::Elf_sizes<size>::rela_size;
|
|
|
|
if (reloc_size != shdr.get_sh_entsize())
|
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
this->error(_("unexpected entsize for reloc section %u: %lu != %u"),
|
|
|
|
i, static_cast<unsigned long>(shdr.get_sh_entsize()),
|
|
|
|
reloc_size);
|
|
|
|
continue;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t reloc_count = sh_size / reloc_size;
|
2007-10-03 04:52:18 +08:00
|
|
|
if (static_cast<off_t>(reloc_count * reloc_size) != sh_size)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
this->error(_("reloc section %u size %lu uneven"),
|
|
|
|
i, static_cast<unsigned long>(sh_size));
|
|
|
|
continue;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
rd->relocs.push_back(Section_relocs());
|
|
|
|
Section_relocs& sr(rd->relocs.back());
|
|
|
|
sr.reloc_shndx = i;
|
|
|
|
sr.data_shndx = shndx;
|
2007-09-26 01:50:26 +08:00
|
|
|
sr.contents = this->get_lasting_view(shdr.get_sh_offset(), sh_size,
|
2008-04-03 04:58:21 +08:00
|
|
|
true, true);
|
2006-10-21 04:40:49 +08:00
|
|
|
sr.sh_type = sh_type;
|
|
|
|
sr.reloc_count = reloc_count;
|
2007-11-09 15:00:15 +08:00
|
|
|
sr.output_section = os;
|
2008-11-15 09:40:23 +08:00
|
|
|
sr.needs_special_offset_handling = out_offsets[shndx] == invalid_address;
|
2008-02-28 06:38:18 +08:00
|
|
|
sr.is_data_section_allocated = is_section_allocated;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Read the local symbols.
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert(this->symtab_shndx_ != -1U);
|
2006-11-08 02:51:39 +08:00
|
|
|
if (this->symtab_shndx_ == 0 || this->local_symbol_count_ == 0)
|
2006-10-21 04:40:49 +08:00
|
|
|
rd->local_symbols = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
typename This::Shdr symtabshdr(pshdrs
|
2006-11-08 02:51:39 +08:00
|
|
|
+ this->symtab_shndx_ * This::shdr_size);
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
|
2009-12-15 03:53:05 +08:00
|
|
|
const int sym_size = This::sym_size;
|
2006-10-21 04:40:49 +08:00
|
|
|
const unsigned int loccount = this->local_symbol_count_;
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert(loccount == symtabshdr.get_sh_info());
|
2009-12-15 03:53:05 +08:00
|
|
|
off_t locsize = loccount * sym_size;
|
2006-10-21 04:40:49 +08:00
|
|
|
rd->local_symbols = this->get_lasting_view(symtabshdr.get_sh_offset(),
|
2008-04-03 04:58:21 +08:00
|
|
|
locsize, true, true);
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-28 10:25:33 +08:00
|
|
|
// Process the relocs to generate mappings from source sections to referenced
|
2010-12-15 03:03:30 +08:00
|
|
|
// sections. This is used during garbage collection to determine garbage
|
2009-01-28 10:25:33 +08:00
|
|
|
// sections.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::do_gc_process_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd)
|
2009-01-28 10:25:33 +08:00
|
|
|
{
|
2009-10-01 06:21:13 +08:00
|
|
|
Sized_target<size, big_endian>* target =
|
|
|
|
parameters->sized_target<size, big_endian>();
|
2009-01-28 10:25:33 +08:00
|
|
|
|
|
|
|
const unsigned char* local_symbols;
|
|
|
|
if (rd->local_symbols == NULL)
|
|
|
|
local_symbols = NULL;
|
|
|
|
else
|
|
|
|
local_symbols = rd->local_symbols->data();
|
|
|
|
|
|
|
|
for (Read_relocs_data::Relocs_list::iterator p = rd->relocs.begin();
|
|
|
|
p != rd->relocs.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (!parameters->options().relocatable())
|
|
|
|
{
|
|
|
|
// As noted above, when not generating an object file, we
|
|
|
|
// only scan allocated sections. We may see a non-allocated
|
|
|
|
// section here if we are emitting relocs.
|
|
|
|
if (p->is_data_section_allocated)
|
2009-12-15 03:53:05 +08:00
|
|
|
target->gc_process_relocs(symtab, layout, this,
|
2009-01-28 10:25:33 +08:00
|
|
|
p->data_shndx, p->sh_type,
|
|
|
|
p->contents->data(), p->reloc_count,
|
|
|
|
p->output_section,
|
|
|
|
p->needs_special_offset_handling,
|
|
|
|
this->local_symbol_count_,
|
|
|
|
local_symbols);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Scan the relocs and adjust the symbol table. This looks for
|
|
|
|
// relocations which require GOT/PLT/COPY relocations.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::do_scan_relocs(Symbol_table* symtab,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2009-10-01 06:21:13 +08:00
|
|
|
Sized_target<size, big_endian>* target =
|
|
|
|
parameters->sized_target<size, big_endian>();
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
const unsigned char* local_symbols;
|
|
|
|
if (rd->local_symbols == NULL)
|
|
|
|
local_symbols = NULL;
|
|
|
|
else
|
|
|
|
local_symbols = rd->local_symbols->data();
|
|
|
|
|
2010-08-13 06:01:11 +08:00
|
|
|
// For incremental links, allocate the counters for incremental relocations.
|
|
|
|
if (layout->incremental_inputs() != NULL)
|
|
|
|
this->allocate_incremental_reloc_counts();
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
for (Read_relocs_data::Relocs_list::iterator p = rd->relocs.begin();
|
|
|
|
p != rd->relocs.end();
|
|
|
|
++p)
|
|
|
|
{
|
2009-01-28 10:25:33 +08:00
|
|
|
// When garbage collection is on, unreferenced sections are not included
|
|
|
|
// in the link that would have been included normally. This is known only
|
|
|
|
// after Read_relocs hence this check has to be done again.
|
2009-10-14 05:17:43 +08:00
|
|
|
if (parameters->options().gc_sections()
|
|
|
|
|| parameters->options().icf_enabled())
|
2009-01-28 10:25:33 +08:00
|
|
|
{
|
|
|
|
if (p->output_section == NULL)
|
|
|
|
continue;
|
|
|
|
}
|
2008-02-28 08:18:24 +08:00
|
|
|
if (!parameters->options().relocatable())
|
2008-02-28 06:38:18 +08:00
|
|
|
{
|
|
|
|
// As noted above, when not generating an object file, we
|
|
|
|
// only scan allocated sections. We may see a non-allocated
|
|
|
|
// section here if we are emitting relocs.
|
|
|
|
if (p->is_data_section_allocated)
|
2009-12-15 03:53:05 +08:00
|
|
|
target->scan_relocs(symtab, layout, this, p->data_shndx,
|
2008-02-28 06:38:18 +08:00
|
|
|
p->sh_type, p->contents->data(),
|
|
|
|
p->reloc_count, p->output_section,
|
|
|
|
p->needs_special_offset_handling,
|
|
|
|
this->local_symbol_count_,
|
|
|
|
local_symbols);
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().emit_relocs())
|
2009-12-15 03:53:05 +08:00
|
|
|
this->emit_relocs_scan(symtab, layout, local_symbols, p);
|
2010-08-13 06:01:11 +08:00
|
|
|
if (layout->incremental_inputs() != NULL)
|
|
|
|
this->incremental_relocs_scan(p);
|
2008-02-28 06:38:18 +08:00
|
|
|
}
|
2008-02-06 16:13:50 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
Relocatable_relocs* rr = this->relocatable_relocs(p->reloc_shndx);
|
|
|
|
gold_assert(rr != NULL);
|
|
|
|
rr->set_reloc_count(p->reloc_count);
|
2009-12-15 03:53:05 +08:00
|
|
|
target->scan_relocatable_relocs(symtab, layout, this,
|
2008-02-06 16:13:50 +08:00
|
|
|
p->data_shndx, p->sh_type,
|
|
|
|
p->contents->data(),
|
|
|
|
p->reloc_count,
|
|
|
|
p->output_section,
|
|
|
|
p->needs_special_offset_handling,
|
|
|
|
this->local_symbol_count_,
|
|
|
|
local_symbols,
|
|
|
|
rr);
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
delete p->contents;
|
|
|
|
p->contents = NULL;
|
|
|
|
}
|
|
|
|
|
2010-08-13 06:01:11 +08:00
|
|
|
// For incremental links, finalize the allocation of relocations.
|
|
|
|
if (layout->incremental_inputs() != NULL)
|
2011-04-12 08:44:48 +08:00
|
|
|
this->finalize_incremental_relocs(layout, true);
|
2010-08-13 06:01:11 +08:00
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
if (rd->local_symbols != NULL)
|
|
|
|
{
|
|
|
|
delete rd->local_symbols;
|
|
|
|
rd->local_symbols = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-28 06:38:18 +08:00
|
|
|
// Scan the input relocations for --emit-relocs.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::emit_relocs_scan(
|
2008-02-28 06:38:18 +08:00
|
|
|
Symbol_table* symtab,
|
2009-12-15 03:53:05 +08:00
|
|
|
Layout* layout,
|
2008-02-28 06:38:18 +08:00
|
|
|
const unsigned char* plocal_syms,
|
|
|
|
const Read_relocs_data::Relocs_list::iterator& p)
|
|
|
|
{
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
Sized_target<size, big_endian>* target =
|
|
|
|
parameters->sized_target<size, big_endian>();
|
|
|
|
|
2008-02-28 06:38:18 +08:00
|
|
|
Relocatable_relocs* rr = this->relocatable_relocs(p->reloc_shndx);
|
|
|
|
gold_assert(rr != NULL);
|
|
|
|
rr->set_reloc_count(p->reloc_count);
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
target->emit_relocs_scan(
|
2008-02-28 06:38:18 +08:00
|
|
|
symtab,
|
2009-12-15 03:53:05 +08:00
|
|
|
layout,
|
2008-02-28 06:38:18 +08:00
|
|
|
this,
|
|
|
|
p->data_shndx,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
p->sh_type,
|
2008-02-28 06:38:18 +08:00
|
|
|
p->contents->data(),
|
|
|
|
p->reloc_count,
|
|
|
|
p->output_section,
|
|
|
|
p->needs_special_offset_handling,
|
|
|
|
this->local_symbol_count_,
|
|
|
|
plocal_syms,
|
|
|
|
rr);
|
|
|
|
}
|
|
|
|
|
2010-08-13 06:01:11 +08:00
|
|
|
// Scan the input relocations for --incremental.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::incremental_relocs_scan(
|
2010-08-13 06:01:11 +08:00
|
|
|
const Read_relocs_data::Relocs_list::iterator& p)
|
|
|
|
{
|
|
|
|
if (p->sh_type == elfcpp::SHT_REL)
|
|
|
|
this->incremental_relocs_scan_reltype<elfcpp::SHT_REL>(p);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert(p->sh_type == elfcpp::SHT_RELA);
|
|
|
|
this->incremental_relocs_scan_reltype<elfcpp::SHT_RELA>(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-12 08:44:48 +08:00
|
|
|
// Scan the input relocation for --incremental, templatized on the
|
2010-08-13 06:01:11 +08:00
|
|
|
// type of the relocation section.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
template<int sh_type>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::incremental_relocs_scan_reltype(
|
2010-08-13 06:01:11 +08:00
|
|
|
const Read_relocs_data::Relocs_list::iterator& p)
|
|
|
|
{
|
|
|
|
typedef typename Reloc_types<sh_type, size, big_endian>::Reloc Reltype;
|
|
|
|
const int reloc_size = Reloc_types<sh_type, size, big_endian>::reloc_size;
|
|
|
|
const unsigned char* prelocs = p->contents->data();
|
|
|
|
size_t reloc_count = p->reloc_count;
|
|
|
|
|
|
|
|
for (size_t i = 0; i < reloc_count; ++i, prelocs += reloc_size)
|
|
|
|
{
|
|
|
|
Reltype reloc(prelocs);
|
|
|
|
|
|
|
|
if (p->needs_special_offset_handling
|
|
|
|
&& !p->output_section->is_input_address_mapped(this, p->data_shndx,
|
|
|
|
reloc.get_r_offset()))
|
|
|
|
continue;
|
|
|
|
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
// FIXME: Some targets have a non-standard r_info field.
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_WXword r_info = reloc.get_r_info();
|
2010-08-13 06:01:11 +08:00
|
|
|
const unsigned int r_sym = elfcpp::elf_r_sym<size>(r_info);
|
|
|
|
|
|
|
|
if (r_sym >= this->local_symbol_count_)
|
|
|
|
this->count_incremental_reloc(r_sym - this->local_symbol_count_);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Relocate the input sections and write out the local symbols.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::do_relocate(const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
Output_file* of)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned int shnum = this->shnum();
|
2006-09-30 03:58:17 +08:00
|
|
|
|
|
|
|
// Read the section headers.
|
2006-11-08 02:51:39 +08:00
|
|
|
const unsigned char* pshdrs = this->get_view(this->elf_file_.shoff(),
|
2009-12-15 03:53:05 +08:00
|
|
|
shnum * This::shdr_size,
|
2008-04-03 04:58:21 +08:00
|
|
|
true, true);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
|
|
|
Views views;
|
2009-12-15 03:53:05 +08:00
|
|
|
views.resize(shnum);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
|
|
|
// Make two passes over the sections. The first one copies the
|
|
|
|
// section data to the output file. The second one applies
|
|
|
|
// relocations.
|
|
|
|
|
2011-06-25 08:40:57 +08:00
|
|
|
this->write_sections(layout, pshdrs, of, &views);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-12-22 05:19:45 +08:00
|
|
|
// To speed up relocations, we set up hash tables for fast lookup of
|
|
|
|
// input offsets to output addresses.
|
|
|
|
this->initialize_input_to_output_maps();
|
|
|
|
|
2015-12-12 06:01:22 +08:00
|
|
|
// Make the views available through get_output_view() for the duration
|
|
|
|
// of this routine. This RAII class will reset output_views_ to NULL
|
|
|
|
// when the views go out of scope.
|
|
|
|
struct Set_output_views
|
|
|
|
{
|
|
|
|
Set_output_views(const Views** ppviews, const Views* pviews)
|
|
|
|
{
|
|
|
|
ppviews_ = ppviews;
|
|
|
|
*ppviews = pviews;
|
|
|
|
}
|
|
|
|
|
|
|
|
~Set_output_views()
|
|
|
|
{ *ppviews_ = NULL; }
|
|
|
|
|
|
|
|
const Views** ppviews_;
|
|
|
|
};
|
|
|
|
Set_output_views set_output_views(&this->output_views_, &views);
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Apply relocations.
|
|
|
|
|
2010-08-13 06:01:11 +08:00
|
|
|
this->relocate_sections(symtab, layout, pshdrs, of, &views);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-12-22 05:19:45 +08:00
|
|
|
// After we've done the relocations, we release the hash tables,
|
|
|
|
// since we no longer need them.
|
|
|
|
this->free_input_to_output_maps();
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Write out the accumulated views.
|
2009-12-15 03:53:05 +08:00
|
|
|
for (unsigned int i = 1; i < shnum; ++i)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
|
|
|
if (views[i].view != NULL)
|
2007-11-09 15:00:15 +08:00
|
|
|
{
|
2011-06-25 08:40:57 +08:00
|
|
|
if (views[i].is_ctors_reverse_view)
|
|
|
|
this->reverse_words(views[i].view, views[i].view_size);
|
2007-12-01 14:34:12 +08:00
|
|
|
if (!views[i].is_postprocessing_view)
|
|
|
|
{
|
|
|
|
if (views[i].is_input_output_view)
|
|
|
|
of->write_input_output_view(views[i].offset,
|
|
|
|
views[i].view_size,
|
|
|
|
views[i].view);
|
|
|
|
else
|
|
|
|
of->write_output_view(views[i].offset, views[i].view_size,
|
|
|
|
views[i].view);
|
|
|
|
}
|
2007-11-09 15:00:15 +08:00
|
|
|
}
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Write out the local symbols.
|
2009-12-15 03:53:05 +08:00
|
|
|
this->write_local_symbols(of, layout->sympool(), layout->dynpool(),
|
2011-04-12 08:44:48 +08:00
|
|
|
layout->symtab_xindex(), layout->dynsym_xindex(),
|
2011-04-15 07:29:41 +08:00
|
|
|
layout->symtab_section_offset());
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
2008-01-03 07:48:49 +08:00
|
|
|
// Sort a Read_multiple vector by file offset.
|
|
|
|
struct Read_multiple_compare
|
|
|
|
{
|
|
|
|
inline bool
|
|
|
|
operator()(const File_read::Read_multiple_entry& rme1,
|
|
|
|
const File_read::Read_multiple_entry& rme2) const
|
|
|
|
{ return rme1.file_offset < rme2.file_offset; }
|
|
|
|
};
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Write section data to the output file. PSHDRS points to the
|
|
|
|
// section headers. Record the views in *PVIEWS for use when
|
|
|
|
// relocating.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-06-25 08:40:57 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::write_sections(const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
2011-05-25 05:41:10 +08:00
|
|
|
Output_file* of,
|
|
|
|
Views* pviews)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned int shnum = this->shnum();
|
2008-07-11 07:01:20 +08:00
|
|
|
const Output_sections& out_sections(this->output_sections());
|
2011-05-25 05:41:10 +08:00
|
|
|
const std::vector<Address>& out_offsets(this->section_offsets());
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2008-01-03 07:48:49 +08:00
|
|
|
File_read::Read_multiple rm;
|
|
|
|
bool is_sorted = true;
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
const unsigned char* p = pshdrs + This::shdr_size;
|
2009-12-15 03:53:05 +08:00
|
|
|
for (unsigned int i = 1; i < shnum; ++i, p += This::shdr_size)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
|
|
|
View_size* pvs = &(*pviews)[i];
|
|
|
|
|
|
|
|
pvs->view = NULL;
|
|
|
|
|
2008-07-11 07:01:20 +08:00
|
|
|
const Output_section* os = out_sections[i];
|
2006-09-30 03:58:17 +08:00
|
|
|
if (os == NULL)
|
|
|
|
continue;
|
2008-07-11 07:01:20 +08:00
|
|
|
Address output_offset = out_offsets[i];
|
2006-09-30 03:58:17 +08:00
|
|
|
|
|
|
|
typename This::Shdr shdr(p);
|
|
|
|
|
|
|
|
if (shdr.get_sh_type() == elfcpp::SHT_NOBITS)
|
|
|
|
continue;
|
|
|
|
|
2008-02-28 08:18:24 +08:00
|
|
|
if ((parameters->options().relocatable()
|
|
|
|
|| parameters->options().emit_relocs())
|
2008-02-06 16:13:50 +08:00
|
|
|
&& (shdr.get_sh_type() == elfcpp::SHT_REL
|
|
|
|
|| shdr.get_sh_type() == elfcpp::SHT_RELA)
|
|
|
|
&& (shdr.get_sh_flags() & elfcpp::SHF_ALLOC) == 0)
|
|
|
|
{
|
2008-02-28 06:38:18 +08:00
|
|
|
// This is a reloc section in a relocatable link or when
|
|
|
|
// emitting relocs. We don't need to read the input file.
|
|
|
|
// The size and file offset are stored in the
|
|
|
|
// Relocatable_relocs structure.
|
2008-02-06 16:13:50 +08:00
|
|
|
Relocatable_relocs* rr = this->relocatable_relocs(i);
|
|
|
|
gold_assert(rr != NULL);
|
|
|
|
Output_data* posd = rr->output_data();
|
|
|
|
gold_assert(posd != NULL);
|
|
|
|
|
|
|
|
pvs->offset = posd->offset();
|
|
|
|
pvs->view_size = posd->data_size();
|
|
|
|
pvs->view = of->get_output_view(pvs->offset, pvs->view_size);
|
|
|
|
pvs->address = posd->address();
|
|
|
|
pvs->is_input_output_view = false;
|
|
|
|
pvs->is_postprocessing_view = false;
|
2011-06-25 08:40:57 +08:00
|
|
|
pvs->is_ctors_reverse_view = false;
|
2008-02-06 16:13:50 +08:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-12-01 14:34:12 +08:00
|
|
|
// In the normal case, this input section is simply mapped to
|
|
|
|
// the output section at offset OUTPUT_OFFSET.
|
|
|
|
|
2008-09-30 05:10:26 +08:00
|
|
|
// However, if OUTPUT_OFFSET == INVALID_ADDRESS, then input data is
|
|
|
|
// handled specially--e.g., a .eh_frame section. The relocation
|
2007-12-01 14:34:12 +08:00
|
|
|
// routines need to check for each reloc where it should be
|
|
|
|
// applied. For this case, we need an input/output view for the
|
|
|
|
// entire contents of the section in the output file. We don't
|
|
|
|
// want to copy the contents of the input section to the output
|
|
|
|
// section; the output section contents were already written,
|
|
|
|
// and we waited for them in Relocate_task::is_runnable because
|
|
|
|
// relocs_must_follow_section_writes is set for the object.
|
|
|
|
|
|
|
|
// Regardless of which of the above cases is true, we have to
|
|
|
|
// check requires_postprocessing of the output section. If that
|
|
|
|
// is false, then we work with views of the output file
|
|
|
|
// directly. If it is true, then we work with a separate
|
|
|
|
// buffer, and the output section is responsible for writing the
|
|
|
|
// final data to the output file.
|
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
off_t output_section_offset;
|
2008-07-11 07:01:20 +08:00
|
|
|
Address output_section_size;
|
2007-12-01 14:34:12 +08:00
|
|
|
if (!os->requires_postprocessing())
|
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
output_section_offset = os->offset();
|
2008-07-11 07:01:20 +08:00
|
|
|
output_section_size = convert_types<Address, off_t>(os->data_size());
|
2007-12-01 14:34:12 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
output_section_offset = 0;
|
2008-07-11 07:01:20 +08:00
|
|
|
output_section_size =
|
|
|
|
convert_types<Address, off_t>(os->postprocessing_buffer_size());
|
2007-12-01 14:34:12 +08:00
|
|
|
}
|
|
|
|
|
2007-11-09 15:00:15 +08:00
|
|
|
off_t view_start;
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size;
|
2010-07-13 01:59:58 +08:00
|
|
|
bool must_decompress = false;
|
2008-09-30 05:10:26 +08:00
|
|
|
if (output_offset != invalid_address)
|
2007-11-09 15:00:15 +08:00
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
view_start = output_section_offset + output_offset;
|
2007-12-21 05:21:24 +08:00
|
|
|
view_size = convert_to_section_size_type(shdr.get_sh_size());
|
2010-07-13 01:59:58 +08:00
|
|
|
section_size_type uncompressed_size;
|
|
|
|
if (this->section_is_compressed(i, &uncompressed_size))
|
|
|
|
{
|
|
|
|
view_size = uncompressed_size;
|
|
|
|
must_decompress = true;
|
|
|
|
}
|
2007-11-09 15:00:15 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
view_start = output_section_offset;
|
2007-12-21 05:21:24 +08:00
|
|
|
view_size = convert_to_section_size_type(output_section_size);
|
2007-11-09 15:00:15 +08:00
|
|
|
}
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-11-09 15:00:15 +08:00
|
|
|
if (view_size == 0)
|
2006-11-04 02:26:11 +08:00
|
|
|
continue;
|
|
|
|
|
2008-09-30 05:10:26 +08:00
|
|
|
gold_assert(output_offset == invalid_address
|
2008-07-11 07:01:20 +08:00
|
|
|
|| output_offset + view_size <= output_section_size);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned char* view;
|
2007-12-01 14:34:12 +08:00
|
|
|
if (os->requires_postprocessing())
|
|
|
|
{
|
|
|
|
unsigned char* buffer = os->postprocessing_buffer();
|
2009-12-15 03:53:05 +08:00
|
|
|
view = buffer + view_start;
|
2010-07-13 01:59:58 +08:00
|
|
|
if (output_offset != invalid_address && !must_decompress)
|
2008-01-03 07:48:49 +08:00
|
|
|
{
|
|
|
|
off_t sh_offset = shdr.get_sh_offset();
|
|
|
|
if (!rm.empty() && rm.back().file_offset > sh_offset)
|
|
|
|
is_sorted = false;
|
|
|
|
rm.push_back(File_read::Read_multiple_entry(sh_offset,
|
2009-12-15 03:53:05 +08:00
|
|
|
view_size, view));
|
2008-01-03 07:48:49 +08:00
|
|
|
}
|
2007-12-01 14:34:12 +08:00
|
|
|
}
|
2007-11-09 15:00:15 +08:00
|
|
|
else
|
|
|
|
{
|
2008-09-30 05:10:26 +08:00
|
|
|
if (output_offset == invalid_address)
|
2009-12-15 03:53:05 +08:00
|
|
|
view = of->get_input_output_view(view_start, view_size);
|
2007-12-01 14:34:12 +08:00
|
|
|
else
|
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
view = of->get_output_view(view_start, view_size);
|
2010-07-13 01:59:58 +08:00
|
|
|
if (!must_decompress)
|
|
|
|
{
|
|
|
|
off_t sh_offset = shdr.get_sh_offset();
|
|
|
|
if (!rm.empty() && rm.back().file_offset > sh_offset)
|
|
|
|
is_sorted = false;
|
|
|
|
rm.push_back(File_read::Read_multiple_entry(sh_offset,
|
|
|
|
view_size, view));
|
|
|
|
}
|
2007-12-01 14:34:12 +08:00
|
|
|
}
|
2007-11-09 15:00:15 +08:00
|
|
|
}
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2010-07-13 01:59:58 +08:00
|
|
|
if (must_decompress)
|
|
|
|
{
|
|
|
|
// Read and decompress the section.
|
|
|
|
section_size_type len;
|
|
|
|
const unsigned char* p = this->section_contents(i, &len, false);
|
2015-07-13 01:50:25 +08:00
|
|
|
if (!decompress_input_section(p, len, view, view_size,
|
|
|
|
size, big_endian,
|
|
|
|
shdr.get_sh_flags()))
|
2010-07-13 01:59:58 +08:00
|
|
|
this->error(_("could not decompress section %s"),
|
|
|
|
this->section_name(i).c_str());
|
|
|
|
}
|
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
pvs->view = view;
|
2007-11-09 15:00:15 +08:00
|
|
|
pvs->address = os->address();
|
2008-09-30 05:10:26 +08:00
|
|
|
if (output_offset != invalid_address)
|
2007-11-09 15:00:15 +08:00
|
|
|
pvs->address += output_offset;
|
|
|
|
pvs->offset = view_start;
|
|
|
|
pvs->view_size = view_size;
|
2008-09-30 05:10:26 +08:00
|
|
|
pvs->is_input_output_view = output_offset == invalid_address;
|
2007-12-01 14:34:12 +08:00
|
|
|
pvs->is_postprocessing_view = os->requires_postprocessing();
|
2011-06-25 08:40:57 +08:00
|
|
|
pvs->is_ctors_reverse_view =
|
|
|
|
(!parameters->options().relocatable()
|
|
|
|
&& view_size > size / 8
|
|
|
|
&& (strcmp(os->name(), ".init_array") == 0
|
|
|
|
|| strcmp(os->name(), ".fini_array") == 0)
|
|
|
|
&& layout->is_ctors_in_init_array(this, i));
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
2008-01-03 07:48:49 +08:00
|
|
|
|
|
|
|
// Actually read the data.
|
|
|
|
if (!rm.empty())
|
|
|
|
{
|
|
|
|
if (!is_sorted)
|
|
|
|
std::sort(rm.begin(), rm.end(), Read_multiple_compare());
|
|
|
|
this->read_multiple(rm);
|
|
|
|
}
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Relocate section data. VIEWS points to the section data as views
|
|
|
|
// in the output file.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::do_relocate_sections(
|
2006-10-21 04:40:49 +08:00
|
|
|
const Symbol_table* symtab,
|
2009-12-15 03:53:05 +08:00
|
|
|
const Layout* layout,
|
2006-10-21 04:40:49 +08:00
|
|
|
const unsigned char* pshdrs,
|
2010-08-13 06:01:11 +08:00
|
|
|
Output_file* of,
|
2006-10-21 04:40:49 +08:00
|
|
|
Views* pviews)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2017-01-10 23:46:30 +08:00
|
|
|
this->relocate_section_range(symtab, layout, pshdrs, of, pviews,
|
|
|
|
1, this->shnum() - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Relocate section data for the range of sections START_SHNDX through
|
|
|
|
// END_SHNDX.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
Sized_relobj_file<size, big_endian>::relocate_section_range(
|
|
|
|
const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
Output_file* of,
|
|
|
|
Views* pviews,
|
|
|
|
unsigned int start_shndx,
|
|
|
|
unsigned int end_shndx)
|
|
|
|
{
|
|
|
|
gold_assert(start_shndx >= 1);
|
|
|
|
gold_assert(end_shndx < this->shnum());
|
|
|
|
|
|
|
|
if (end_shndx < start_shndx)
|
|
|
|
return;
|
|
|
|
|
2009-10-01 06:21:13 +08:00
|
|
|
Sized_target<size, big_endian>* target =
|
|
|
|
parameters->sized_target<size, big_endian>();
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2008-07-11 07:01:20 +08:00
|
|
|
const Output_sections& out_sections(this->output_sections());
|
2011-05-25 05:41:10 +08:00
|
|
|
const std::vector<Address>& out_offsets(this->section_offsets());
|
2007-11-09 15:00:15 +08:00
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
Relocate_info<size, big_endian> relinfo;
|
|
|
|
relinfo.symtab = symtab;
|
2009-12-15 03:53:05 +08:00
|
|
|
relinfo.layout = layout;
|
2006-10-21 04:40:49 +08:00
|
|
|
relinfo.object = this;
|
|
|
|
|
2017-01-10 23:46:30 +08:00
|
|
|
const unsigned char* p = pshdrs + start_shndx * This::shdr_size;
|
|
|
|
for (unsigned int i = start_shndx; i <= end_shndx; ++i, p += This::shdr_size)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
|
|
|
typename This::Shdr shdr(p);
|
|
|
|
|
|
|
|
unsigned int sh_type = shdr.get_sh_type();
|
|
|
|
if (sh_type != elfcpp::SHT_REL && sh_type != elfcpp::SHT_RELA)
|
|
|
|
continue;
|
|
|
|
|
2009-06-24 22:36:14 +08:00
|
|
|
off_t sh_size = shdr.get_sh_size();
|
|
|
|
if (sh_size == 0)
|
|
|
|
continue;
|
|
|
|
|
2008-04-20 02:30:58 +08:00
|
|
|
unsigned int index = this->adjust_shndx(shdr.get_sh_info());
|
2006-09-30 03:58:17 +08:00
|
|
|
if (index >= this->shnum())
|
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
this->error(_("relocation section %u has bad info %u"),
|
|
|
|
i, index);
|
|
|
|
continue;
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
2008-07-11 07:01:20 +08:00
|
|
|
Output_section* os = out_sections[index];
|
2007-11-09 15:00:15 +08:00
|
|
|
if (os == NULL)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
|
|
|
// This relocation section is against a section which we
|
|
|
|
// discarded.
|
|
|
|
continue;
|
|
|
|
}
|
2008-07-11 07:01:20 +08:00
|
|
|
Address output_offset = out_offsets[index];
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert((*pviews)[index].view != NULL);
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().relocatable())
|
2008-02-06 16:13:50 +08:00
|
|
|
gold_assert((*pviews)[i].view != NULL);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2008-04-20 02:30:58 +08:00
|
|
|
if (this->adjust_shndx(shdr.get_sh_link()) != this->symtab_shndx_)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("relocation section %u uses unexpected "
|
|
|
|
"symbol table %u"),
|
2008-04-20 02:30:58 +08:00
|
|
|
i, this->adjust_shndx(shdr.get_sh_link()));
|
2007-10-14 14:49:14 +08:00
|
|
|
continue;
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
const unsigned char* prelocs = this->get_view(shdr.get_sh_offset(),
|
2008-04-03 04:58:21 +08:00
|
|
|
sh_size, true, false);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
|
|
|
unsigned int reloc_size;
|
|
|
|
if (sh_type == elfcpp::SHT_REL)
|
|
|
|
reloc_size = elfcpp::Elf_sizes<size>::rel_size;
|
|
|
|
else
|
|
|
|
reloc_size = elfcpp::Elf_sizes<size>::rela_size;
|
|
|
|
|
|
|
|
if (reloc_size != shdr.get_sh_entsize())
|
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("unexpected entsize for reloc section %u: %lu != %u"),
|
|
|
|
i, static_cast<unsigned long>(shdr.get_sh_entsize()),
|
2007-11-09 15:00:15 +08:00
|
|
|
reloc_size);
|
2007-10-14 14:49:14 +08:00
|
|
|
continue;
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t reloc_count = sh_size / reloc_size;
|
2007-10-03 04:52:18 +08:00
|
|
|
if (static_cast<off_t>(reloc_count * reloc_size) != sh_size)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("reloc section %u size %lu uneven"),
|
|
|
|
i, static_cast<unsigned long>(sh_size));
|
|
|
|
continue;
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
2008-09-30 05:10:26 +08:00
|
|
|
gold_assert(output_offset != invalid_address
|
2007-12-01 14:34:12 +08:00
|
|
|
|| this->relocs_must_follow_section_writes());
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
relinfo.reloc_shndx = i;
|
2009-10-15 08:33:18 +08:00
|
|
|
relinfo.reloc_shdr = p;
|
2006-10-21 04:40:49 +08:00
|
|
|
relinfo.data_shndx = index;
|
2009-10-15 08:33:18 +08:00
|
|
|
relinfo.data_shdr = pshdrs + index * This::shdr_size;
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned char* view = (*pviews)[index].view;
|
2009-10-07 06:58:27 +08:00
|
|
|
Address address = (*pviews)[index].address;
|
|
|
|
section_size_type view_size = (*pviews)[index].view_size;
|
|
|
|
|
|
|
|
Reloc_symbol_changes* reloc_map = NULL;
|
|
|
|
if (this->uses_split_stack() && output_offset != invalid_address)
|
|
|
|
{
|
|
|
|
typename This::Shdr data_shdr(pshdrs + index * This::shdr_size);
|
|
|
|
if ((data_shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0)
|
|
|
|
this->split_stack_adjust(symtab, pshdrs, sh_type, index,
|
2009-12-15 03:53:05 +08:00
|
|
|
prelocs, reloc_count, view, view_size,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
&reloc_map, target);
|
2009-10-07 06:58:27 +08:00
|
|
|
}
|
|
|
|
|
[GOLD] Relocate::relocate() params
Some linker code editing needs to change multiple insns. In some
cases multiple relocations are involved and it is not sufficient to
make the changes independently as relocations are processed, because
doing so might lead to a partial edit. So in order to safely edit we
need all the relocations available in relocate(). Also, to emit
edited relocs corresponding to the edited code sequence we need some
way to pass information from relocate() to relocate_relocs(),
particularly if the edit depends on insns. We can't modify input
relocs in relocate() as they are mmapped PROT_READ, nor it is
particularly clean to write relocs to the output at that stage. So
add a Relocatable_relocs* field to relinfo to mark edited relocs.
Given that relocate is passed the raw reloc pointer, it makes sense to
remove the rel/rela parameter and r_type too. However, that means the
mips relocate() needs to know whether SHT_REL or SHT_RELA relocs are
being processed. So add a rel_type for mips, which also has the
benefit of removing relocate() overloading there.
This patch adds the infrastructure without making use of it.
Note that relinfo->rr will be NULL if not outputting relocations.
* object.h (struct Relocate_info): Add "rr".
* reloc.h (Relocatable_relocs::set_strategy): New accessor.
* reloc.cc (Sized_relobj_file::do_relocate_sections): Init
relinfo.rr for relocate_section and relocate_relocs.
* powerpc.cc (relocate): Add rel_type and preloc parameters.
Delete rela and r_type params, instead recalculate these from
preloc.
(relocate_relocs): Delete Relocatable_relocs* param, instead
use relinfo->rr.
* aarch64.cc: Likewise.
* arm.cc: Likewise.
* i386.cc: Likewise.
* mips.cc: Likewise.
* s390.cc: Likewise.
* sparc.cc: Likewise.
* target.h: Likewise.
* tilegx.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
* target-reloc.h (relocate_section): Adjust to suit.
(apply_relocation, relocate_relocs): Likewise.
2015-12-09 07:48:30 +08:00
|
|
|
Relocatable_relocs* rr = NULL;
|
|
|
|
if (parameters->options().emit_relocs()
|
|
|
|
|| parameters->options().relocatable())
|
|
|
|
rr = this->relocatable_relocs(i);
|
|
|
|
relinfo.rr = rr;
|
|
|
|
|
2008-02-28 08:18:24 +08:00
|
|
|
if (!parameters->options().relocatable())
|
2008-02-28 06:38:18 +08:00
|
|
|
{
|
2009-10-07 06:58:27 +08:00
|
|
|
target->relocate_section(&relinfo, sh_type, prelocs, reloc_count, os,
|
2008-09-30 05:10:26 +08:00
|
|
|
output_offset == invalid_address,
|
2009-12-15 03:53:05 +08:00
|
|
|
view, address, view_size, reloc_map);
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().emit_relocs())
|
[GOLD] Relocate::relocate() params
Some linker code editing needs to change multiple insns. In some
cases multiple relocations are involved and it is not sufficient to
make the changes independently as relocations are processed, because
doing so might lead to a partial edit. So in order to safely edit we
need all the relocations available in relocate(). Also, to emit
edited relocs corresponding to the edited code sequence we need some
way to pass information from relocate() to relocate_relocs(),
particularly if the edit depends on insns. We can't modify input
relocs in relocate() as they are mmapped PROT_READ, nor it is
particularly clean to write relocs to the output at that stage. So
add a Relocatable_relocs* field to relinfo to mark edited relocs.
Given that relocate is passed the raw reloc pointer, it makes sense to
remove the rel/rela parameter and r_type too. However, that means the
mips relocate() needs to know whether SHT_REL or SHT_RELA relocs are
being processed. So add a rel_type for mips, which also has the
benefit of removing relocate() overloading there.
This patch adds the infrastructure without making use of it.
Note that relinfo->rr will be NULL if not outputting relocations.
* object.h (struct Relocate_info): Add "rr".
* reloc.h (Relocatable_relocs::set_strategy): New accessor.
* reloc.cc (Sized_relobj_file::do_relocate_sections): Init
relinfo.rr for relocate_section and relocate_relocs.
* powerpc.cc (relocate): Add rel_type and preloc parameters.
Delete rela and r_type params, instead recalculate these from
preloc.
(relocate_relocs): Delete Relocatable_relocs* param, instead
use relinfo->rr.
* aarch64.cc: Likewise.
* arm.cc: Likewise.
* i386.cc: Likewise.
* mips.cc: Likewise.
* s390.cc: Likewise.
* sparc.cc: Likewise.
* target.h: Likewise.
* tilegx.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
* target-reloc.h (relocate_section): Adjust to suit.
(apply_relocation, relocate_relocs): Likewise.
2015-12-09 07:48:30 +08:00
|
|
|
target->relocate_relocs(&relinfo, sh_type, prelocs, reloc_count,
|
|
|
|
os, output_offset,
|
|
|
|
view, address, view_size,
|
|
|
|
(*pviews)[i].view,
|
|
|
|
(*pviews)[i].view_size);
|
2010-10-15 06:10:22 +08:00
|
|
|
if (parameters->incremental())
|
2010-08-13 06:01:11 +08:00
|
|
|
this->incremental_relocs_write(&relinfo, sh_type, prelocs,
|
|
|
|
reloc_count, os, output_offset, of);
|
2008-02-28 06:38:18 +08:00
|
|
|
}
|
2008-02-06 16:13:50 +08:00
|
|
|
else
|
[GOLD] Relocate::relocate() params
Some linker code editing needs to change multiple insns. In some
cases multiple relocations are involved and it is not sufficient to
make the changes independently as relocations are processed, because
doing so might lead to a partial edit. So in order to safely edit we
need all the relocations available in relocate(). Also, to emit
edited relocs corresponding to the edited code sequence we need some
way to pass information from relocate() to relocate_relocs(),
particularly if the edit depends on insns. We can't modify input
relocs in relocate() as they are mmapped PROT_READ, nor it is
particularly clean to write relocs to the output at that stage. So
add a Relocatable_relocs* field to relinfo to mark edited relocs.
Given that relocate is passed the raw reloc pointer, it makes sense to
remove the rel/rela parameter and r_type too. However, that means the
mips relocate() needs to know whether SHT_REL or SHT_RELA relocs are
being processed. So add a rel_type for mips, which also has the
benefit of removing relocate() overloading there.
This patch adds the infrastructure without making use of it.
Note that relinfo->rr will be NULL if not outputting relocations.
* object.h (struct Relocate_info): Add "rr".
* reloc.h (Relocatable_relocs::set_strategy): New accessor.
* reloc.cc (Sized_relobj_file::do_relocate_sections): Init
relinfo.rr for relocate_section and relocate_relocs.
* powerpc.cc (relocate): Add rel_type and preloc parameters.
Delete rela and r_type params, instead recalculate these from
preloc.
(relocate_relocs): Delete Relocatable_relocs* param, instead
use relinfo->rr.
* aarch64.cc: Likewise.
* arm.cc: Likewise.
* i386.cc: Likewise.
* mips.cc: Likewise.
* s390.cc: Likewise.
* sparc.cc: Likewise.
* target.h: Likewise.
* tilegx.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
* target-reloc.h (relocate_section): Adjust to suit.
(apply_relocation, relocate_relocs): Likewise.
2015-12-09 07:48:30 +08:00
|
|
|
target->relocate_relocs(&relinfo, sh_type, prelocs, reloc_count,
|
|
|
|
os, output_offset,
|
|
|
|
view, address, view_size,
|
|
|
|
(*pviews)[i].view,
|
|
|
|
(*pviews)[i].view_size);
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-12 06:01:22 +08:00
|
|
|
// Return the output view for section SHNDX.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
2015-12-14 06:04:24 +08:00
|
|
|
unsigned char*
|
2015-12-12 06:01:22 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::do_get_output_view(
|
|
|
|
unsigned int shndx,
|
|
|
|
section_size_type* plen) const
|
|
|
|
{
|
|
|
|
gold_assert(this->output_views_ != NULL);
|
|
|
|
gold_assert(shndx < this->output_views_->size());
|
|
|
|
const View_size& v = (*this->output_views_)[shndx];
|
|
|
|
*plen = v.view_size;
|
|
|
|
return v.view;
|
|
|
|
}
|
|
|
|
|
2010-08-13 06:01:11 +08:00
|
|
|
// Write the incremental relocs.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::incremental_relocs_write(
|
2010-08-13 06:01:11 +08:00
|
|
|
const Relocate_info<size, big_endian>* relinfo,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
Address output_offset,
|
|
|
|
Output_file* of)
|
|
|
|
{
|
|
|
|
if (sh_type == elfcpp::SHT_REL)
|
|
|
|
this->incremental_relocs_write_reltype<elfcpp::SHT_REL>(
|
|
|
|
relinfo,
|
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
|
|
|
output_section,
|
|
|
|
output_offset,
|
|
|
|
of);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert(sh_type == elfcpp::SHT_RELA);
|
|
|
|
this->incremental_relocs_write_reltype<elfcpp::SHT_RELA>(
|
|
|
|
relinfo,
|
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
|
|
|
output_section,
|
|
|
|
output_offset,
|
|
|
|
of);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write the incremental relocs, templatized on the type of the
|
|
|
|
// relocation section.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
template<int sh_type>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::incremental_relocs_write_reltype(
|
2010-08-13 06:01:11 +08:00
|
|
|
const Relocate_info<size, big_endian>* relinfo,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
Address output_offset,
|
|
|
|
Output_file* of)
|
|
|
|
{
|
|
|
|
typedef typename Reloc_types<sh_type, size, big_endian>::Reloc Reloc;
|
|
|
|
const unsigned int reloc_size =
|
|
|
|
Reloc_types<sh_type, size, big_endian>::reloc_size;
|
|
|
|
const unsigned int sizeof_addr = size / 8;
|
2011-04-12 08:44:48 +08:00
|
|
|
const unsigned int incr_reloc_size =
|
|
|
|
Incremental_relocs_reader<size, big_endian>::reloc_size;
|
2010-08-13 06:01:11 +08:00
|
|
|
|
|
|
|
unsigned int out_shndx = output_section->out_shndx();
|
|
|
|
|
|
|
|
// Get a view for the .gnu_incremental_relocs section.
|
|
|
|
|
|
|
|
Incremental_inputs* inputs = relinfo->layout->incremental_inputs();
|
|
|
|
gold_assert(inputs != NULL);
|
|
|
|
const off_t relocs_off = inputs->relocs_section()->offset();
|
|
|
|
const off_t relocs_size = inputs->relocs_section()->data_size();
|
|
|
|
unsigned char* const view = of->get_output_view(relocs_off, relocs_size);
|
|
|
|
|
|
|
|
for (size_t i = 0; i < reloc_count; ++i, prelocs += reloc_size)
|
|
|
|
{
|
|
|
|
Reloc reloc(prelocs);
|
|
|
|
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
// FIXME: Some targets have a non-standard r_info field.
|
2010-08-13 06:01:11 +08:00
|
|
|
typename elfcpp::Elf_types<size>::Elf_WXword r_info = reloc.get_r_info();
|
|
|
|
const unsigned int r_sym = elfcpp::elf_r_sym<size>(r_info);
|
|
|
|
const unsigned int r_type = elfcpp::elf_r_type<size>(r_info);
|
|
|
|
|
|
|
|
if (r_sym < this->local_symbol_count_)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// Get the new offset--the location in the output section where
|
|
|
|
// this relocation should be applied.
|
|
|
|
|
|
|
|
Address offset = reloc.get_r_offset();
|
|
|
|
if (output_offset != invalid_address)
|
|
|
|
offset += output_offset;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
section_offset_type sot_offset =
|
|
|
|
convert_types<section_offset_type, Address>(offset);
|
|
|
|
section_offset_type new_sot_offset =
|
|
|
|
output_section->output_offset(relinfo->object,
|
|
|
|
relinfo->data_shndx,
|
|
|
|
sot_offset);
|
|
|
|
gold_assert(new_sot_offset != -1);
|
|
|
|
offset += new_sot_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the addend.
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Swxword addend;
|
|
|
|
if (sh_type == elfcpp::SHT_RELA)
|
|
|
|
addend =
|
|
|
|
Reloc_types<sh_type, size, big_endian>::get_reloc_addend(&reloc);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// FIXME: Get the addend for SHT_REL.
|
|
|
|
addend = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the index of the output relocation.
|
|
|
|
|
|
|
|
unsigned int reloc_index =
|
|
|
|
this->next_incremental_reloc_index(r_sym - this->local_symbol_count_);
|
|
|
|
|
|
|
|
// Write the relocation.
|
|
|
|
|
|
|
|
unsigned char* pov = view + reloc_index * incr_reloc_size;
|
|
|
|
elfcpp::Swap<32, big_endian>::writeval(pov, r_type);
|
|
|
|
elfcpp::Swap<32, big_endian>::writeval(pov + 4, out_shndx);
|
|
|
|
elfcpp::Swap<size, big_endian>::writeval(pov + 8, offset);
|
|
|
|
elfcpp::Swap<size, big_endian>::writeval(pov + 8 + sizeof_addr, addend);
|
|
|
|
of->write_output_view(pov - view, incr_reloc_size, view);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-22 05:19:45 +08:00
|
|
|
// Create merge hash tables for the local symbols. These are used to
|
|
|
|
// speed up relocations.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::initialize_input_to_output_maps()
|
2007-12-22 05:19:45 +08:00
|
|
|
{
|
|
|
|
const unsigned int loccount = this->local_symbol_count_;
|
|
|
|
for (unsigned int i = 1; i < loccount; ++i)
|
|
|
|
{
|
|
|
|
Symbol_value<size>& lv(this->local_values_[i]);
|
|
|
|
lv.initialize_input_to_output_map(this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Free merge hash tables for the local symbols.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::free_input_to_output_maps()
|
2007-12-22 05:19:45 +08:00
|
|
|
{
|
|
|
|
const unsigned int loccount = this->local_symbol_count_;
|
|
|
|
for (unsigned int i = 1; i < loccount; ++i)
|
|
|
|
{
|
|
|
|
Symbol_value<size>& lv(this->local_values_[i]);
|
|
|
|
lv.free_input_to_output_map();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-07 06:58:27 +08:00
|
|
|
// If an object was compiled with -fsplit-stack, this is called to
|
|
|
|
// check whether any relocations refer to functions defined in objects
|
|
|
|
// which were not compiled with -fsplit-stack. If they were, then we
|
|
|
|
// need to apply some target-specific adjustments to request
|
|
|
|
// additional stack space.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::split_stack_adjust(
|
2009-10-07 06:58:27 +08:00
|
|
|
const Symbol_table* symtab,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
unsigned int sh_type,
|
|
|
|
unsigned int shndx,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned char* view,
|
2009-10-07 06:58:27 +08:00
|
|
|
section_size_type view_size,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
Reloc_symbol_changes** reloc_map,
|
|
|
|
const Sized_target<size, big_endian>* target)
|
2009-10-07 06:58:27 +08:00
|
|
|
{
|
|
|
|
if (sh_type == elfcpp::SHT_REL)
|
|
|
|
this->split_stack_adjust_reltype<elfcpp::SHT_REL>(symtab, pshdrs, shndx,
|
|
|
|
prelocs, reloc_count,
|
2009-12-15 03:53:05 +08:00
|
|
|
view, view_size,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
reloc_map, target);
|
2009-10-07 06:58:27 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert(sh_type == elfcpp::SHT_RELA);
|
|
|
|
this->split_stack_adjust_reltype<elfcpp::SHT_RELA>(symtab, pshdrs, shndx,
|
|
|
|
prelocs, reloc_count,
|
2009-12-15 03:53:05 +08:00
|
|
|
view, view_size,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
reloc_map, target);
|
2009-10-07 06:58:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Adjust for -fsplit-stack, templatized on the type of the relocation
|
|
|
|
// section.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
template<int sh_type>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::split_stack_adjust_reltype(
|
2009-10-07 06:58:27 +08:00
|
|
|
const Symbol_table* symtab,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
unsigned int shndx,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned char* view,
|
2009-10-07 06:58:27 +08:00
|
|
|
section_size_type view_size,
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
Reloc_symbol_changes** reloc_map,
|
|
|
|
const Sized_target<size, big_endian>* target)
|
2009-10-07 06:58:27 +08:00
|
|
|
{
|
|
|
|
typedef typename Reloc_types<sh_type, size, big_endian>::Reloc Reltype;
|
|
|
|
const int reloc_size = Reloc_types<sh_type, size, big_endian>::reloc_size;
|
|
|
|
|
|
|
|
size_t local_count = this->local_symbol_count();
|
|
|
|
|
|
|
|
std::vector<section_offset_type> non_split_refs;
|
|
|
|
|
|
|
|
const unsigned char* pr = prelocs;
|
|
|
|
for (size_t i = 0; i < reloc_count; ++i, pr += reloc_size)
|
|
|
|
{
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
// Some supported targets have a non-standard r_info field.
|
|
|
|
// If this call is too slow, we can move this routine to
|
|
|
|
// target-reloc.h and templatize it on Classify_reloc.
|
|
|
|
unsigned int r_sym = target->get_r_sym(pr);
|
2009-10-07 06:58:27 +08:00
|
|
|
if (r_sym < local_count)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const Symbol* gsym = this->global_symbol(r_sym);
|
|
|
|
gold_assert(gsym != NULL);
|
|
|
|
if (gsym->is_forwarder())
|
|
|
|
gsym = symtab->resolve_forwards(gsym);
|
|
|
|
|
|
|
|
// See if this relocation refers to a function defined in an
|
|
|
|
// object compiled without -fsplit-stack. Note that we don't
|
|
|
|
// care about the type of relocation--this means that in some
|
|
|
|
// cases we will ask for a large stack unnecessarily, but this
|
|
|
|
// is not fatal. FIXME: Some targets have symbols which are
|
|
|
|
// functions but are not type STT_FUNC, e.g., STT_ARM_TFUNC.
|
2010-03-11 09:10:53 +08:00
|
|
|
if (!gsym->is_undefined()
|
2009-10-07 06:58:27 +08:00
|
|
|
&& gsym->source() == Symbol::FROM_OBJECT
|
|
|
|
&& !gsym->object()->uses_split_stack())
|
|
|
|
{
|
2016-02-06 08:52:00 +08:00
|
|
|
if (parameters->target().is_call_to_non_split(gsym, pr, view,
|
|
|
|
view_size))
|
2010-03-11 09:10:53 +08:00
|
|
|
{
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
Reltype reloc(pr);
|
2010-03-11 09:10:53 +08:00
|
|
|
section_offset_type offset =
|
|
|
|
convert_to_section_size_type(reloc.get_r_offset());
|
|
|
|
non_split_refs.push_back(offset);
|
|
|
|
}
|
2009-10-07 06:58:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (non_split_refs.empty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
// At this point, every entry in NON_SPLIT_REFS indicates a
|
|
|
|
// relocation which refers to a function in an object compiled
|
|
|
|
// without -fsplit-stack. We now have to convert that list into a
|
|
|
|
// set of offsets to functions. First, we find all the functions.
|
|
|
|
|
|
|
|
Function_offsets function_offsets;
|
|
|
|
this->find_functions(pshdrs, shndx, &function_offsets);
|
|
|
|
if (function_offsets.empty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Now get a list of the function with references to non split-stack
|
|
|
|
// code.
|
|
|
|
|
|
|
|
Function_offsets calls_non_split;
|
|
|
|
for (std::vector<section_offset_type>::const_iterator p
|
|
|
|
= non_split_refs.begin();
|
|
|
|
p != non_split_refs.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
Function_offsets::const_iterator low = function_offsets.lower_bound(*p);
|
|
|
|
if (low == function_offsets.end())
|
|
|
|
--low;
|
|
|
|
else if (low->first == *p)
|
|
|
|
;
|
|
|
|
else if (low == function_offsets.begin())
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
--low;
|
|
|
|
|
|
|
|
calls_non_split.insert(*low);
|
|
|
|
}
|
|
|
|
if (calls_non_split.empty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Now we have a set of functions to adjust. The adjustments are
|
|
|
|
// target specific. Besides changing the output section view
|
|
|
|
// however, it likes, the target may request a relocation change
|
|
|
|
// from one global symbol name to another.
|
|
|
|
|
|
|
|
for (Function_offsets::const_iterator p = calls_non_split.begin();
|
|
|
|
p != calls_non_split.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
std::string from;
|
|
|
|
std::string to;
|
|
|
|
parameters->target().calls_non_split(this, shndx, p->first, p->second,
|
2015-12-12 06:20:41 +08:00
|
|
|
prelocs, reloc_count,
|
2009-12-15 03:53:05 +08:00
|
|
|
view, view_size, &from, &to);
|
2009-10-07 06:58:27 +08:00
|
|
|
if (!from.empty())
|
|
|
|
{
|
|
|
|
gold_assert(!to.empty());
|
|
|
|
Symbol* tosym = NULL;
|
|
|
|
|
|
|
|
// Find relocations in the relevant function which are for
|
|
|
|
// FROM.
|
|
|
|
pr = prelocs;
|
|
|
|
for (size_t i = 0; i < reloc_count; ++i, pr += reloc_size)
|
|
|
|
{
|
|
|
|
Reltype reloc(pr);
|
|
|
|
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
unsigned int r_sym = target->get_r_sym(pr);
|
2009-10-07 06:58:27 +08:00
|
|
|
if (r_sym < local_count)
|
|
|
|
continue;
|
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
section_offset_type offset =
|
2009-10-07 06:58:27 +08:00
|
|
|
convert_to_section_size_type(reloc.get_r_offset());
|
2009-12-15 03:53:05 +08:00
|
|
|
if (offset < p->first
|
|
|
|
|| (offset
|
2009-10-07 06:58:27 +08:00
|
|
|
>= (p->first
|
|
|
|
+ static_cast<section_offset_type>(p->second))))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const Symbol* gsym = this->global_symbol(r_sym);
|
|
|
|
if (from == gsym->name())
|
|
|
|
{
|
|
|
|
if (tosym == NULL)
|
|
|
|
{
|
|
|
|
tosym = symtab->lookup(to.c_str());
|
|
|
|
if (tosym == NULL)
|
|
|
|
{
|
|
|
|
this->error(_("could not convert call "
|
|
|
|
"to '%s' to '%s'"),
|
|
|
|
from.c_str(), to.c_str());
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*reloc_map == NULL)
|
|
|
|
*reloc_map = new Reloc_symbol_changes(reloc_count);
|
|
|
|
(*reloc_map)->set(i, tosym);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find all the function in this object defined in section SHNDX.
|
|
|
|
// Store their offsets in the section in FUNCTION_OFFSETS.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::find_functions(
|
2009-10-07 06:58:27 +08:00
|
|
|
const unsigned char* pshdrs,
|
|
|
|
unsigned int shndx,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<size, big_endian>::Function_offsets* function_offsets)
|
2009-10-07 06:58:27 +08:00
|
|
|
{
|
|
|
|
// We need to read the symbols to find the functions. If we wanted
|
|
|
|
// to, we could cache reading the symbols across all sections in the
|
|
|
|
// object.
|
2009-12-15 03:53:05 +08:00
|
|
|
const unsigned int symtab_shndx = this->symtab_shndx_;
|
|
|
|
typename This::Shdr symtabshdr(pshdrs + symtab_shndx * This::shdr_size);
|
2009-10-07 06:58:27 +08:00
|
|
|
gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
|
|
|
|
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_WXword sh_size =
|
|
|
|
symtabshdr.get_sh_size();
|
|
|
|
const unsigned char* psyms = this->get_view(symtabshdr.get_sh_offset(),
|
|
|
|
sh_size, true, true);
|
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
const int sym_size = This::sym_size;
|
|
|
|
const unsigned int symcount = sh_size / sym_size;
|
|
|
|
for (unsigned int i = 0; i < symcount; ++i, psyms += sym_size)
|
2009-10-07 06:58:27 +08:00
|
|
|
{
|
|
|
|
typename elfcpp::Sym<size, big_endian> isym(psyms);
|
|
|
|
|
|
|
|
// FIXME: Some targets can have functions which do not have type
|
|
|
|
// STT_FUNC, e.g., STT_ARM_TFUNC.
|
|
|
|
if (isym.get_st_type() != elfcpp::STT_FUNC
|
|
|
|
|| isym.get_st_size() == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bool is_ordinary;
|
2015-05-13 12:42:38 +08:00
|
|
|
Symbol_location loc;
|
|
|
|
loc.shndx = this->adjust_sym_shndx(i, isym.get_st_shndx(),
|
|
|
|
&is_ordinary);
|
|
|
|
if (!is_ordinary)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
loc.object = this;
|
|
|
|
loc.offset = isym.get_st_value();
|
|
|
|
parameters->target().function_location(&loc);
|
|
|
|
|
|
|
|
if (loc.shndx != shndx)
|
2009-10-07 06:58:27 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
section_offset_type value =
|
2015-05-13 12:42:38 +08:00
|
|
|
convert_to_section_size_type(loc.offset);
|
2009-10-07 06:58:27 +08:00
|
|
|
section_size_type fnsize =
|
|
|
|
convert_to_section_size_type(isym.get_st_size());
|
|
|
|
|
|
|
|
(*function_offsets)[value] = fnsize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-06-25 08:40:57 +08:00
|
|
|
// Reverse the words in a section. Used for .ctors sections mapped to
|
|
|
|
// .init_array sections. See ctors_sections_in_init_array in
|
|
|
|
// layout.cc.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
Sized_relobj_file<size, big_endian>::reverse_words(unsigned char* view,
|
|
|
|
section_size_type view_size)
|
|
|
|
{
|
|
|
|
typedef typename elfcpp::Swap<size, big_endian>::Valtype Valtype;
|
|
|
|
Valtype* vview = reinterpret_cast<Valtype*>(view);
|
|
|
|
section_size_type vview_size = view_size / (size / 8);
|
|
|
|
for (section_size_type i = 0; i < vview_size / 2; ++i)
|
|
|
|
{
|
|
|
|
Valtype tmp = vview[i];
|
|
|
|
vview[i] = vview[vview_size - 1 - i];
|
|
|
|
vview[vview_size - 1 - i] = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-22 05:19:45 +08:00
|
|
|
// Class Merged_symbol_value.
|
|
|
|
|
|
|
|
template<int size>
|
|
|
|
void
|
|
|
|
Merged_symbol_value<size>::initialize_input_to_output_map(
|
|
|
|
const Relobj* object,
|
|
|
|
unsigned int input_shndx)
|
|
|
|
{
|
2015-03-05 07:10:18 +08:00
|
|
|
object->initialize_input_to_output_map<size>(input_shndx,
|
|
|
|
this->output_start_address_,
|
|
|
|
&this->output_addresses_);
|
2007-12-22 05:19:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get the output value corresponding to an input offset if we
|
|
|
|
// couldn't find it in the hash table.
|
|
|
|
|
|
|
|
template<int size>
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr
|
|
|
|
Merged_symbol_value<size>::value_from_output_section(
|
|
|
|
const Relobj* object,
|
|
|
|
unsigned int input_shndx,
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr input_offset) const
|
|
|
|
{
|
|
|
|
section_offset_type output_offset;
|
2015-03-05 07:10:18 +08:00
|
|
|
bool found = object->merge_output_offset(input_shndx, input_offset,
|
|
|
|
&output_offset);
|
2007-12-22 05:19:45 +08:00
|
|
|
|
|
|
|
// If this assertion fails, it means that some relocation was
|
|
|
|
// against a portion of an input merge section which we didn't map
|
|
|
|
// to the output file and we didn't explicitly discard. We should
|
|
|
|
// always map all portions of input merge sections.
|
|
|
|
gold_assert(found);
|
|
|
|
|
|
|
|
if (output_offset == -1)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return this->output_start_address_ + output_offset;
|
|
|
|
}
|
|
|
|
|
2007-11-09 15:00:15 +08:00
|
|
|
// Track_relocs methods.
|
|
|
|
|
|
|
|
// Initialize the class to track the relocs. This gets the object,
|
|
|
|
// the reloc section index, and the type of the relocs. This returns
|
|
|
|
// false if something goes wrong.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
bool
|
|
|
|
Track_relocs<size, big_endian>::initialize(
|
2007-11-13 04:35:21 +08:00
|
|
|
Object* object,
|
2007-11-09 15:00:15 +08:00
|
|
|
unsigned int reloc_shndx,
|
|
|
|
unsigned int reloc_type)
|
|
|
|
{
|
|
|
|
// If RELOC_SHNDX is -1U, it means there is more than one reloc
|
|
|
|
// section for the .eh_frame section. We can't handle that case.
|
|
|
|
if (reloc_shndx == -1U)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// If RELOC_SHNDX is 0, there is no reloc section.
|
|
|
|
if (reloc_shndx == 0)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// Get the contents of the reloc section.
|
|
|
|
this->prelocs_ = object->section_contents(reloc_shndx, &this->len_, false);
|
|
|
|
|
|
|
|
if (reloc_type == elfcpp::SHT_REL)
|
|
|
|
this->reloc_size_ = elfcpp::Elf_sizes<size>::rel_size;
|
|
|
|
else if (reloc_type == elfcpp::SHT_RELA)
|
|
|
|
this->reloc_size_ = elfcpp::Elf_sizes<size>::rela_size;
|
|
|
|
else
|
|
|
|
gold_unreachable();
|
|
|
|
|
|
|
|
if (this->len_ % this->reloc_size_ != 0)
|
|
|
|
{
|
|
|
|
object->error(_("reloc section size %zu is not a multiple of "
|
|
|
|
"reloc size %d\n"),
|
|
|
|
static_cast<size_t>(this->len_),
|
|
|
|
this->reloc_size_);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the offset of the next reloc, or -1 if there isn't one.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
off_t
|
|
|
|
Track_relocs<size, big_endian>::next_offset() const
|
|
|
|
{
|
|
|
|
if (this->pos_ >= this->len_)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
// Rel and Rela start out the same, so we can always use Rel to find
|
|
|
|
// the r_offset value.
|
|
|
|
elfcpp::Rel<size, big_endian> rel(this->prelocs_ + this->pos_);
|
|
|
|
return rel.get_r_offset();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the index of the symbol referenced by the next reloc, or -1U
|
|
|
|
// if there aren't any more relocs.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
unsigned int
|
|
|
|
Track_relocs<size, big_endian>::next_symndx() const
|
|
|
|
{
|
|
|
|
if (this->pos_ >= this->len_)
|
|
|
|
return -1U;
|
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is
replaced by several individual fields, including r_sym and
r_type. To enable support for this format, I've refactored
target-independent code to remove almost all uses of the r_info
field. (I've left alone a couple of routines used only for
incremental linking, which I can update if/when the MIPS target
adds support for incremental linking.)
For routines that are already templated on a Classify_reloc class
(namely, gc_process_relocs, relocate_section, and
relocate_relocs), I've extended the Classify_reloc interface to
include sh_type (which no longer needs to be a separate template
parameter) as well as get_r_sym() and get_r_type() methods for
extracting the r_sym and r_type fields. For
scan_relocatable_relocs, I've extended the
Default_scan_relocatable_relocs class by converting it to a class
template with Classify_reloc as a template parameter. For the
remaining routines that need to access r_sym, I've added a
virtual Target::get_r_sym() method with an override for the MIPS
target.
In elfcpp, I've added Mips64_rel, etc., accessor classes and
corresponding internal data structures. The MIPS target uses
these new classes within its own Mips_classify_reloc class.
The Mips64_ accessor classes also expose the r_ssym, r_type2,
and r_type3 fields from the relocation.
These changes should be functionally the same for all but the
MIPS target.
elfcpp/
* elfcpp.h (Mips64_rel, Mips64_rel_write): New classes.
(Mips64_rela, Mips64_rela_write): New classes.
* elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs.
gold/
* gc.h (get_embedded_addend_size): Remove sh_type parameter.
(gc_process_relocs): Remove sh_type template parameter.
Use Classify_reloc to access r_sym, r_type, and r_addend fields.
* object.h (Sized_relobj_file::split_stack_adjust): Add target
parameter.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise.
* reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA
specializations) Remove.
* reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h.
(Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan().
(Sized_relobj_file::emit_relocs_scan_reltype): Remove.
(Sized_relobj_file::split_stack_adjust): Add target parameter.
Adjust all callers.
(Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call
Target::get_r_sym() to get r_sym field from relocations.
(Track_relocs::next_symndx): Call Target::get_r_sym().
* target-reloc.h (scan_relocs): Remove sh_type template parameter;
add Classify_reloc template parameter. Use for accessing r_sym and
r_type.
(relocate_section): Likewise.
(Default_classify_reloc): New class (renamed and moved from reloc.cc).
(Default_scan_relocatable_relocs): Remove sh_type template parameter.
(Default_scan_relocatable_relocs::Reltype): New typedef.
(Default_scan_relocatable_relocs::reloc_size): New const.
(Default_scan_relocatable_relocs::sh_type): New const.
(Default_scan_relocatable_relocs::get_r_sym): New method.
(Default_scan_relocatable_relocs::get_r_type): New method.
(Default_emit_relocs_strategy): New class.
(scan_relocatable_relocs): Replace sh_type template parameter with
Scan_relocatable_relocs class. Use it to access r_sym and r_type
fields.
(relocate_relocs): Replace sh_type template parameter with
Classify_reloc class. Use it to access r_sym and r_type fields.
* target.h (Target::is_call_to_non_split): Replace r_type parameter
with pointer to relocation. Adjust all callers.
(Target::do_is_call_to_non_split): Likewise.
(Target::emit_relocs_scan): New virtual method.
(Sized_target::get_r_sym): New virtual method.
* target.cc (Target::do_is_call_to_non_split): Replace r_type parameter
with pointer to relocation.
* aarch64.cc (Target_aarch64::emit_relocs_scan): New method.
(Target_aarch64::Relocatable_size_for_reloc): Remove.
(Target_aarch64::gc_process_relocs): Use Default_classify_reloc.
(Target_aarch64::scan_relocs): Likewise.
(Target_aarch64::relocate_section): Likewise.
(Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_aarch64::relocate_relocs): Use Default_classify_reloc.
* arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type
template parameter.
(Target_arm::emit_relocs_scan): New method.
(Target_arm::Relocatable_size_for_reloc): Replace with...
(Target_arm::Classify_reloc): ...this.
(Target_arm::gc_process_relocs): Use Classify_reloc.
(Target_arm::scan_relocs): Likewise.
(Target_arm::relocate_section): Likewise.
(Target_arm::scan_relocatable_relocs): Likewise.
(Target_arm::relocate_relocs): Likewise.
* i386.cc (Target_i386::emit_relocs_scan): New method.
(Target_i386::Relocatable_size_for_reloc): Replace with...
(Target_i386::Classify_reloc): ...this.
(Target_i386::gc_process_relocs): Use Classify_reloc.
(Target_i386::scan_relocs): Likewise.
(Target_i386::relocate_section): Likewise.
(Target_i386::scan_relocatable_relocs): Likewise.
(Target_i386::relocate_relocs): Likewise.
* mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template
parameter.
(Mips_reloc_types): New class template.
(Mips_classify_reloc): New class template.
(Target_mips::Reltype): New typedef.
(Target_mips::Relatype): New typedef.
(Target_mips::emit_relocs_scan): New method.
(Target_mips::get_r_sym): New method.
(Target_mips::Relocatable_size_for_reloc): Replace with
Mips_classify_reloc.
(Target_mips::copy_reloc): Use Mips_classify_reloc.
(Target_mips::gc_process_relocs): Likewise.
(Target_mips::scan_relocs): Likewise.
(Target_mips::relocate_section): Likewise.
(Target_mips::scan_relocatable_relocs): Likewise.
(Target_mips::relocate_relocs): Likewise.
(mips_get_size_for_reloc): New function, factored out from
Relocatable_size_for_reloc::get_size_for_reloc.
(Target_mips::Scan::local): Use Mips_classify_reloc.
(Target_mips::Scan::global): Likewise.
(Target_mips::Relocate::relocate): Likewise.
* powerpc.cc (Target_powerpc::emit_relocs_scan): New method.
(Target_powerpc::Relocatable_size_for_reloc): Remove.
(Target_powerpc::gc_process_relocs): Use Default_classify_reloc.
(Target_powerpc::scan_relocs): Likewise.
(Target_powerpc::relocate_section): Likewise.
(Powerpc_scan_relocatable_reloc): Convert to class template.
(Powerpc_scan_relocatable_reloc::Reltype): New typedef.
(Powerpc_scan_relocatable_reloc::reloc_size): New const.
(Powerpc_scan_relocatable_reloc::sh_type): New const.
(Powerpc_scan_relocatable_reloc::get_r_sym): New method.
(Powerpc_scan_relocatable_reloc::get_r_type): New method.
(Target_powerpc::scan_relocatable_relocs): Use
Powerpc_scan_relocatable_reloc.
(Target_powerpc::relocate_relocs): Use Default_classify_reloc.
* s390.cc (Target_s390::emit_relocs_scan): New method.
(Target_s390::Relocatable_size_for_reloc): Remove.
(Target_s390::gc_process_relocs): Use Default_classify_reloc.
(Target_s390::scan_relocs): Likewise.
(Target_s390::relocate_section): Likewise.
(Target_s390::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_s390::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_s390::relocate_relocs): Use Default_classify_reloc.
* sparc.cc (Target_sparc::emit_relocs_scan): New method.
(Target_sparc::Relocatable_size_for_reloc): Remove.
(Target_sparc::gc_process_relocs): Use Default_classify_reloc.
(Target_sparc::scan_relocs): Likewise.
(Target_sparc::relocate_section): Likewise.
(Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_sparc::relocate_relocs): Use Default_classify_reloc.
* tilegx.cc (Target_tilegx::emit_relocs_scan): New method.
(Target_tilegx::Relocatable_size_for_reloc): Remove.
(Target_tilegx::gc_process_relocs): Use Default_classify_reloc.
(Target_tilegx::scan_relocs): Likewise.
(Target_tilegx::relocate_section): Likewise.
(Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_tilegx::relocate_relocs): Use Default_classify_reloc.
* x86_64.cc (Target_x86_64::emit_relocs_scan): New method.
(Target_x86_64::Relocatable_size_for_reloc): Remove.
(Target_x86_64::gc_process_relocs): Use Default_classify_reloc.
(Target_x86_64::scan_relocs): Likewise.
(Target_x86_64::relocate_section): Likewise.
(Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc):
Remove.
(Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc.
(Target_x86_64::relocate_relocs): Use Default_classify_reloc.
* testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
2015-12-11 23:43:59 +08:00
|
|
|
Sized_target<size, big_endian>* target
|
|
|
|
= parameters->sized_target<size, big_endian>();
|
|
|
|
return target->get_r_sym(this->prelocs_ + this->pos_);
|
2007-11-09 15:00:15 +08:00
|
|
|
}
|
|
|
|
|
2010-12-02 03:49:22 +08:00
|
|
|
// Return the addend of the next reloc, or 0 if there isn't one.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
uint64_t
|
|
|
|
Track_relocs<size, big_endian>::next_addend() const
|
|
|
|
{
|
|
|
|
if (this->pos_ >= this->len_)
|
|
|
|
return 0;
|
|
|
|
if (this->reloc_size_ == elfcpp::Elf_sizes<size>::rel_size)
|
|
|
|
return 0;
|
|
|
|
elfcpp::Rela<size, big_endian> rela(this->prelocs_ + this->pos_);
|
|
|
|
return rela.get_r_addend();
|
|
|
|
}
|
|
|
|
|
2007-11-09 15:00:15 +08:00
|
|
|
// Advance to the next reloc whose r_offset is greater than or equal
|
|
|
|
// to OFFSET. Return the number of relocs we skip.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
int
|
|
|
|
Track_relocs<size, big_endian>::advance(off_t offset)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
while (this->pos_ < this->len_)
|
|
|
|
{
|
|
|
|
// Rel and Rela start out the same, so we can always use Rel to
|
|
|
|
// find the r_offset value.
|
|
|
|
elfcpp::Rel<size, big_endian> rel(this->prelocs_ + this->pos_);
|
|
|
|
if (static_cast<off_t>(rel.get_r_offset()) >= offset)
|
|
|
|
break;
|
2021-07-17 23:35:56 +08:00
|
|
|
// Skip R_*_NONE relocation entries with r_sym of zero
|
|
|
|
// without counting.
|
|
|
|
if (rel.get_r_info() != 0)
|
|
|
|
++ret;
|
2007-11-09 15:00:15 +08:00
|
|
|
this->pos_ += this->reloc_size_;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-04-17 06:54:29 +08:00
|
|
|
// Instantiate the templates we need.
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::do_read_relocs(Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::do_read_relocs(Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::do_read_relocs(Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::do_read_relocs(Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2009-01-28 10:25:33 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::do_gc_process_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2009-01-28 10:25:33 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::do_gc_process_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2009-01-28 10:25:33 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::do_gc_process_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2009-01-28 10:25:33 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::do_gc_process_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2009-01-28 10:25:33 +08:00
|
|
|
#endif
|
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::do_scan_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::do_scan_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::do_scan_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
2006-10-21 04:40:49 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::do_scan_relocs(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Read_relocs_data* rd);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
2006-09-30 03:58:17 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::do_relocate(const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
Output_file* of);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
2006-09-30 03:58:17 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::do_relocate(const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
Output_file* of);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
2006-09-30 03:58:17 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::do_relocate(const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
Output_file* of);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2007-09-05 04:00:53 +08:00
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
2006-09-30 03:58:17 +08:00
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::do_relocate(const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
Output_file* of);
|
2007-09-05 04:00:53 +08:00
|
|
|
#endif
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2009-10-26 00:57:32 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::do_relocate_sections(
|
2009-10-26 00:57:32 +08:00
|
|
|
const Symbol_table* symtab,
|
2009-12-15 03:53:05 +08:00
|
|
|
const Layout* layout,
|
2009-10-26 00:57:32 +08:00
|
|
|
const unsigned char* pshdrs,
|
2010-08-13 06:01:11 +08:00
|
|
|
Output_file* of,
|
2009-10-26 00:57:32 +08:00
|
|
|
Views* pviews);
|
2015-12-12 06:01:22 +08:00
|
|
|
|
2017-01-10 23:46:30 +08:00
|
|
|
template
|
|
|
|
void
|
|
|
|
Sized_relobj_file<32, false>::relocate_section_range(
|
|
|
|
const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
Output_file* of,
|
|
|
|
Views* pviews,
|
|
|
|
unsigned int start_shndx,
|
|
|
|
unsigned int end_shndx);
|
|
|
|
|
2015-12-12 06:01:22 +08:00
|
|
|
template
|
2015-12-14 06:04:24 +08:00
|
|
|
unsigned char*
|
2015-12-12 06:01:22 +08:00
|
|
|
Sized_relobj_file<32, false>::do_get_output_view(
|
|
|
|
unsigned int shndx,
|
|
|
|
section_size_type* plen) const;
|
2009-10-26 00:57:32 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::do_relocate_sections(
|
2009-10-26 00:57:32 +08:00
|
|
|
const Symbol_table* symtab,
|
2009-12-15 03:53:05 +08:00
|
|
|
const Layout* layout,
|
2009-10-26 00:57:32 +08:00
|
|
|
const unsigned char* pshdrs,
|
2010-08-13 06:01:11 +08:00
|
|
|
Output_file* of,
|
2009-10-26 00:57:32 +08:00
|
|
|
Views* pviews);
|
2015-12-12 06:01:22 +08:00
|
|
|
|
2017-01-10 23:46:30 +08:00
|
|
|
template
|
|
|
|
void
|
|
|
|
Sized_relobj_file<32, true>::relocate_section_range(
|
|
|
|
const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
Output_file* of,
|
|
|
|
Views* pviews,
|
|
|
|
unsigned int start_shndx,
|
|
|
|
unsigned int end_shndx);
|
|
|
|
|
2015-12-12 06:01:22 +08:00
|
|
|
template
|
2015-12-14 06:04:24 +08:00
|
|
|
unsigned char*
|
2015-12-12 06:01:22 +08:00
|
|
|
Sized_relobj_file<32, true>::do_get_output_view(
|
|
|
|
unsigned int shndx,
|
|
|
|
section_size_type* plen) const;
|
2009-10-26 00:57:32 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::do_relocate_sections(
|
2009-10-26 00:57:32 +08:00
|
|
|
const Symbol_table* symtab,
|
2009-12-15 03:53:05 +08:00
|
|
|
const Layout* layout,
|
2009-10-26 00:57:32 +08:00
|
|
|
const unsigned char* pshdrs,
|
2010-08-13 06:01:11 +08:00
|
|
|
Output_file* of,
|
2009-10-26 00:57:32 +08:00
|
|
|
Views* pviews);
|
2015-12-12 06:01:22 +08:00
|
|
|
|
2017-01-10 23:46:30 +08:00
|
|
|
template
|
|
|
|
void
|
|
|
|
Sized_relobj_file<64, false>::relocate_section_range(
|
|
|
|
const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
Output_file* of,
|
|
|
|
Views* pviews,
|
|
|
|
unsigned int start_shndx,
|
|
|
|
unsigned int end_shndx);
|
|
|
|
|
2015-12-12 06:01:22 +08:00
|
|
|
template
|
2015-12-14 06:04:24 +08:00
|
|
|
unsigned char*
|
2015-12-12 06:01:22 +08:00
|
|
|
Sized_relobj_file<64, false>::do_get_output_view(
|
|
|
|
unsigned int shndx,
|
|
|
|
section_size_type* plen) const;
|
2009-10-26 00:57:32 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::do_relocate_sections(
|
2009-10-26 00:57:32 +08:00
|
|
|
const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
2010-08-13 06:01:11 +08:00
|
|
|
Output_file* of,
|
2009-10-26 00:57:32 +08:00
|
|
|
Views* pviews);
|
2015-12-12 06:01:22 +08:00
|
|
|
|
2017-01-10 23:46:30 +08:00
|
|
|
template
|
|
|
|
void
|
|
|
|
Sized_relobj_file<64, true>::relocate_section_range(
|
|
|
|
const Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
const unsigned char* pshdrs,
|
|
|
|
Output_file* of,
|
|
|
|
Views* pviews,
|
|
|
|
unsigned int start_shndx,
|
|
|
|
unsigned int end_shndx);
|
|
|
|
|
2015-12-12 06:01:22 +08:00
|
|
|
template
|
2015-12-14 06:04:24 +08:00
|
|
|
unsigned char*
|
2015-12-12 06:01:22 +08:00
|
|
|
Sized_relobj_file<64, true>::do_get_output_view(
|
|
|
|
unsigned int shndx,
|
|
|
|
section_size_type* plen) const;
|
2009-10-26 00:57:32 +08:00
|
|
|
#endif
|
|
|
|
|
2009-11-09 10:02:01 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::initialize_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>::free_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::initialize_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, true>::free_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::initialize_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, false>::free_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::initialize_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
|
|
|
|
template
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<64, true>::free_input_to_output_maps();
|
2009-11-09 10:02:01 +08:00
|
|
|
#endif
|
|
|
|
|
2007-12-22 05:19:45 +08:00
|
|
|
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
|
|
|
|
template
|
|
|
|
class Merged_symbol_value<32>;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
|
|
|
|
template
|
|
|
|
class Merged_symbol_value<64>;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
|
|
|
|
template
|
|
|
|
class Symbol_value<32>;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
|
|
|
|
template
|
|
|
|
class Symbol_value<64>;
|
|
|
|
#endif
|
|
|
|
|
2007-11-09 15:00:15 +08:00
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
|
|
|
template
|
|
|
|
class Track_relocs<32, false>;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
|
|
|
template
|
|
|
|
class Track_relocs<32, true>;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
|
|
|
template
|
|
|
|
class Track_relocs<64, false>;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
|
|
|
template
|
|
|
|
class Track_relocs<64, true>;
|
|
|
|
#endif
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
} // End namespace gold.
|