From 7d1a9ebbf2b6018657e88172df4356ad4733b9c6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 29 Feb 2008 19:19:17 +0000 Subject: Remove gcc 3.2 compatibility hacks. --- gold/resolve.cc | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'gold/resolve.cc') diff --git a/gold/resolve.cc b/gold/resolve.cc index c244ad4..3300000 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -85,16 +85,13 @@ Symbol_table::override(Sized_symbol* tosym, { Symbol* sym = this->weak_aliases_[tosym]; gold_assert(sym != NULL); - Sized_symbol* ssym; - ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) (sym - SELECT_SIZE(size)); + Sized_symbol* ssym = this->get_sized_symbol(sym); do { ssym->override(fromsym, object, version); sym = this->weak_aliases_[ssym]; gold_assert(sym != NULL); - ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) ( - sym SELECT_SIZE(size)); + ssym = this->get_sized_symbol(sym); } while (ssym != tosym); } @@ -194,9 +191,7 @@ Symbol_table::resolve(Sized_symbol* to, if (object->target()->has_resolve()) { Sized_target* sized_target; - sized_target = object->sized_target - SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - SELECT_SIZE_ENDIAN_ONLY(size, big_endian)); + sized_target = object->sized_target(); sized_target->resolve(to, sym, object, version); return; } @@ -715,16 +710,13 @@ Symbol_table::override_with_special(Sized_symbol* tosym, { Symbol* sym = this->weak_aliases_[tosym]; gold_assert(sym != NULL); - Sized_symbol* ssym; - ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) (sym - SELECT_SIZE(size)); + Sized_symbol* ssym = this->get_sized_symbol(sym); do { ssym->override_with_special(fromsym); sym = this->weak_aliases_[ssym]; gold_assert(sym != NULL); - ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) ( - sym SELECT_SIZE(size)); + ssym = this->get_sized_symbol(sym); } while (ssym != tosym); } -- cgit v1.1