FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gcc 3.2.2 portability hacks.

Browse source
This commit is contained in:
Ian Lance Taylor 2006-11-03 18:38:43 +00:00
parent ead1e4244a
commit 593f47df45
7 changed files with 60 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gold/common.cc
View file

@ -84,11 +84,11 @@ Sort_commons<size>::operator()(const Symbol* pa, const Symbol* pb) const
const Symbol_table* symtab = this->symtab_; const Symbol_table* symtab = this->symtab_;
const Sized_symbol<size>* psa; const Sized_symbol<size>* psa;
psa = symtab->get_sized_symbol SELECT_SIZE_NAME (pa psa = symtab->get_sized_symbol SELECT_SIZE_NAME(size) (pa
SELECT_SIZE(size)); SELECT_SIZE(size));
const Sized_symbol<size>* psb; const Sized_symbol<size>* psb;
psb = symtab->get_sized_symbol SELECT_SIZE_NAME (pb psb = symtab->get_sized_symbol SELECT_SIZE_NAME(size) (pb
SELECT_SIZE(size)); SELECT_SIZE(size));
typename Sized_symbol<size>::Size_type sa = psa->symsize(); typename Sized_symbol<size>::Size_type sa = psa->symsize();
typename Sized_symbol<size>::Size_type sb = psb->symsize(); typename Sized_symbol<size>::Size_type sb = psb->symsize();
@ -153,8 +153,9 @@ Symbol_table::do_allocate_commons(const General_options&,
{ {
any = true; any = true;
Sized_symbol<size>* ssym; Sized_symbol<size>* ssym;
ssym = this->get_sized_symbol SELECT_SIZE_NAME (sym ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) (
SELECT_SIZE(size)); sym
SELECT_SIZE(size));
if (ssym->value() > addralign) if (ssym->value() > addralign)
addralign = ssym->value(); addralign = ssym->value();
} }
@ -187,8 +188,8 @@ Symbol_table::do_allocate_commons(const General_options&,
break; break;
Sized_symbol<size>* ssym; Sized_symbol<size>* ssym;
ssym = this->get_sized_symbol SELECT_SIZE_NAME (sym ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) (sym
SELECT_SIZE(size)); SELECT_SIZE(size));
off = align_address(off, ssym->value()); off = align_address(off, ssym->value());

8
gold/gold.h
View file

@ -96,13 +96,13 @@ namespace gold
#ifdef HAVE_MEMBER_TEMPLATE_SPECIFICATIONS #ifdef HAVE_MEMBER_TEMPLATE_SPECIFICATIONS
#define SELECT_SIZE_NAME <size> #define SELECT_SIZE_NAME(size) <size>
#define SELECT_SIZE(size) #define SELECT_SIZE(size)
#define SELECT_SIZE_ONLY(size) #define SELECT_SIZE_ONLY(size)
#define ACCEPT_SIZE #define ACCEPT_SIZE
#define ACCEPT_SIZE_ONLY #define ACCEPT_SIZE_ONLY
#define SELECT_SIZE_ENDIAN_NAME <size, big_endian> #define SELECT_SIZE_ENDIAN_NAME(size, big_endian) <size, big_endian>
#define SELECT_SIZE_ENDIAN(size, big_endian) #define SELECT_SIZE_ENDIAN(size, big_endian)
#define SELECT_SIZE_ENDIAN_ONLY(size, big_endian) #define SELECT_SIZE_ENDIAN_ONLY(size, big_endian)
#define ACCEPT_SIZE_ENDIAN #define ACCEPT_SIZE_ENDIAN
@ -115,13 +115,13 @@ class Select_size { };
template<int size, bool big_endian> template<int size, bool big_endian>
class Select_size_endian { }; class Select_size_endian { };
#define SELECT_SIZE_NAME #define SELECT_SIZE_NAME(size)
#define SELECT_SIZE(size) , Select_size<size>() #define SELECT_SIZE(size) , Select_size<size>()
#define SELECT_SIZE_ONLY(size) Select_size<size>() #define SELECT_SIZE_ONLY(size) Select_size<size>()
#define ACCEPT_SIZE , Select_size<size> #define ACCEPT_SIZE , Select_size<size>
#define ACCEPT_SIZE_ONLY Select_size<size> #define ACCEPT_SIZE_ONLY Select_size<size>
#define SELECT_SIZE_ENDIAN_NAME #define SELECT_SIZE_ENDIAN_NAME(size, big_endian)
#define SELECT_SIZE_ENDIAN(size, big_endian) \ #define SELECT_SIZE_ENDIAN(size, big_endian) \
, Select_size_endian<size, big_endian>() , Select_size_endian<size, big_endian>()
#define SELECT_SIZE_ENDIAN_ONLY(size, big_endian) \ #define SELECT_SIZE_ENDIAN_ONLY(size, big_endian) \

5
gold/object.h
View file

@ -392,8 +392,9 @@ class Sized_object : public Object
Sized_target<size, big_endian>* Sized_target<size, big_endian>*
sized_target() sized_target()
{ {
return this->Object::sized_target SELECT_SIZE_ENDIAN_NAME ( return this->Object::sized_target
SELECT_SIZE_ENDIAN_ONLY(size, big_endian)); SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
SELECT_SIZE_ENDIAN_ONLY(size, big_endian));
} }
private: private:

18
gold/output.cc
View file

@ -144,7 +144,7 @@ Output_section_headers::do_sized_write(Output_file* of)
for (Layout::Segment_list::const_iterator p = this->segment_list_.begin(); for (Layout::Segment_list::const_iterator p = this->segment_list_.begin();
p != this->segment_list_.end(); p != this->segment_list_.end();
++p) ++p)
v = (*p)->write_section_headers SELECT_SIZE_ENDIAN_NAME ( v = (*p)->write_section_headers SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
this->secnamepool_, v, &shndx this->secnamepool_, v, &shndx
SELECT_SIZE_ENDIAN(size, big_endian)); SELECT_SIZE_ENDIAN(size, big_endian));
for (Layout::Section_list::const_iterator p = this->section_list_.begin(); for (Layout::Section_list::const_iterator p = this->section_list_.begin();
@ -333,7 +333,7 @@ Output_file_header::do_sized_write(Output_file* of)
else else
{ {
Sized_symbol<size>* ssym; Sized_symbol<size>* ssym;
ssym = this->symtab_->get_sized_symbol SELECT_SIZE_NAME ( ssym = this->symtab_->get_sized_symbol SELECT_SIZE_NAME(size) (
sym SELECT_SIZE(size)); sym SELECT_SIZE(size));
v = ssym->value(); v = ssym->value();
} }
@ -971,12 +971,14 @@ Output_segment::write_section_headers(const Stringpool* secnamepool,
if (this->type_ != elfcpp::PT_LOAD) if (this->type_ != elfcpp::PT_LOAD)
return v; return v;
v = this->write_section_headers_list SELECT_SIZE_ENDIAN_NAME ( v = this->write_section_headers_list
secnamepool, &this->output_data_, v, pshndx SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
SELECT_SIZE_ENDIAN(size, big_endian)); secnamepool, &this->output_data_, v, pshndx
v = this->write_section_headers_list SELECT_SIZE_ENDIAN_NAME ( SELECT_SIZE_ENDIAN(size, big_endian));
secnamepool, &this->output_bss_, v, pshndx v = this->write_section_headers_list
SELECT_SIZE_ENDIAN(size, big_endian)); SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
secnamepool, &this->output_bss_, v, pshndx
SELECT_SIZE_ENDIAN(size, big_endian));
return v; return v;
} }

5
gold/resolve.cc
View file

@ -55,8 +55,9 @@ Symbol_table::resolve(Sized_symbol<size>* to,
if (object->target()->has_resolve()) if (object->target()->has_resolve())
{ {
Sized_target<size, big_endian>* sized_target; Sized_target<size, big_endian>* sized_target;
sized_target = object->sized_target SELECT_SIZE_ENDIAN_NAME ( sized_target = object->sized_target
SELECT_SIZE_ENDIAN_ONLY(size, big_endian)); SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
SELECT_SIZE_ENDIAN_ONLY(size, big_endian));
sized_target->resolve(to, sym, object); sized_target->resolve(to, sym, object);
return; return;
} }

44
gold/symtab.cc
View file

@ -308,8 +308,8 @@ Symbol_table::add_from_object(Sized_object<size, big_endian>* object,
if (!ins.second) if (!ins.second)
{ {
// We already have an entry for NAME/VERSION. // We already have an entry for NAME/VERSION.
ret = this->get_sized_symbol SELECT_SIZE_NAME (ins.first->second ret = this->get_sized_symbol SELECT_SIZE_NAME(size) (ins.first->second
SELECT_SIZE(size)); SELECT_SIZE(size));
assert(ret != NULL); assert(ret != NULL);
was_undefined = ret->is_undefined(); was_undefined = ret->is_undefined();
@ -330,10 +330,10 @@ Symbol_table::add_from_object(Sized_object<size, big_endian>* object,
// This is the unfortunate case where we already have // This is the unfortunate case where we already have
// entries for both NAME/VERSION and NAME/NULL. // entries for both NAME/VERSION and NAME/NULL.
const Sized_symbol<size>* sym2; const Sized_symbol<size>* sym2;
sym2 = this->get_sized_symbol SELECT_SIZE_NAME ( sym2 = this->get_sized_symbol SELECT_SIZE_NAME(size) (
insdef.first->second insdef.first->second
SELECT_SIZE(size)); SELECT_SIZE(size));
Symbol_table::resolve SELECT_SIZE_ENDIAN_NAME ( Symbol_table::resolve SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
ret, sym2 SELECT_SIZE_ENDIAN(size, big_endian)); ret, sym2 SELECT_SIZE_ENDIAN(size, big_endian));
this->make_forwarder(insdef.first->second, ret); this->make_forwarder(insdef.first->second, ret);
insdef.first->second = ret; insdef.first->second = ret;
@ -352,8 +352,9 @@ Symbol_table::add_from_object(Sized_object<size, big_endian>* object,
{ {
// We already have an entry for NAME/NULL. Make // We already have an entry for NAME/NULL. Make
// NAME/VERSION point to it. // NAME/VERSION point to it.
ret = this->get_sized_symbol SELECT_SIZE_NAME (insdef.first->second ret = this->get_sized_symbol SELECT_SIZE_NAME(size) (
SELECT_SIZE(size)); insdef.first->second
SELECT_SIZE(size));
Symbol_table::resolve(ret, sym, object); Symbol_table::resolve(ret, sym, object);
ins.first->second = ret; ins.first->second = ret;
} }
@ -500,7 +501,8 @@ Symbol_table::add_from_object(
template<int size, bool big_endian> template<int size, bool big_endian>
Sized_symbol<size>* Sized_symbol<size>*
Symbol_table::define_special_symbol(Target* target, const char* name, Symbol_table::define_special_symbol(Target* target, const char* name,
bool only_if_ref) bool only_if_ref
ACCEPT_SIZE_ENDIAN)
{ {
assert(this->size_ == size); assert(this->size_ == size);
@ -562,8 +564,8 @@ Symbol_table::define_special_symbol(Target* target, const char* name,
{ {
assert(sym == NULL); assert(sym == NULL);
sym = this->get_sized_symbol SELECT_SIZE_NAME (oldsym sym = this->get_sized_symbol SELECT_SIZE_NAME(size) (oldsym
SELECT_SIZE(size)); SELECT_SIZE(size));
assert(sym->source() == Symbol::FROM_OBJECT); assert(sym->source() == Symbol::FROM_OBJECT);
const int old_shnum = sym->shnum(); const int old_shnum = sym->shnum();
if (old_shnum != elfcpp::SHN_UNDEF if (old_shnum != elfcpp::SHN_UNDEF
@ -628,9 +630,13 @@ Symbol_table::do_define_in_output_data(
Sized_symbol<size>* sym; Sized_symbol<size>* sym;
if (target->is_big_endian()) if (target->is_big_endian())
sym = this->define_special_symbol<size, true>(target, name, only_if_ref); sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) (
target, name, only_if_ref
SELECT_SIZE_ENDIAN(size, true));
else else
sym = this->define_special_symbol<size, false>(target, name, only_if_ref); sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) (
target, name, only_if_ref
SELECT_SIZE_ENDIAN(size, false));
if (sym == NULL) if (sym == NULL)
return; return;
@ -684,9 +690,13 @@ Symbol_table::do_define_in_output_segment(
Sized_symbol<size>* sym; Sized_symbol<size>* sym;
if (target->is_big_endian()) if (target->is_big_endian())
sym = this->define_special_symbol<size, true>(target, name, only_if_ref); sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) (
target, name, only_if_ref
SELECT_SIZE_ENDIAN(size, true));
else else
sym = this->define_special_symbol<size, false>(target, name, only_if_ref); sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) (
target, name, only_if_ref
SELECT_SIZE_ENDIAN(size, false));
if (sym == NULL) if (sym == NULL)
return; return;
@ -736,9 +746,13 @@ Symbol_table::do_define_as_constant(
Sized_symbol<size>* sym; Sized_symbol<size>* sym;
if (target->is_big_endian()) if (target->is_big_endian())
sym = this->define_special_symbol<size, true>(target, name, only_if_ref); sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) (
target, name, only_if_ref
SELECT_SIZE_ENDIAN(size, true));
else else
sym = this->define_special_symbol<size, false>(target, name, only_if_ref); sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) (
target, name, only_if_ref
SELECT_SIZE_ENDIAN(size, false));
if (sym == NULL) if (sym == NULL)
return; return;

3
gold/symtab.h
View file

@ -507,7 +507,8 @@ class Symbol_table
// Define a special symbol. // Define a special symbol.
template<int size, bool big_endian> template<int size, bool big_endian>
Sized_symbol<size>* Sized_symbol<size>*
define_special_symbol(Target* target, const char* name, bool only_if_ref); define_special_symbol(Target* target, const char* name, bool only_if_ref
ACCEPT_SIZE_ENDIAN);
// Define a special symbol based on an Output_data. It is a // Define a special symbol based on an Output_data. It is a
// multiple definition error if this symbol is already defined. // multiple definition error if this symbol is already defined.