diff options
| author |   Ian Lance Taylor <iant@google.com> | 2008-02-29 19:19:17 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2008-02-29 19:19:17 +0000 |
| commit | 7d1a9ebbf2b6018657e88172df4356ad4733b9c6 (patch) | |
| tree | 684a7533508954f514333d59e7aac505a7764b9f /gold/common.cc | |
| parent | Record GDB 6.8 branch creation. Bump version number to 6.8.50.20080229-cvs. (diff) | |
| download | binutils-gdb-7d1a9ebbf2b6018657e88172df4356ad4733b9c6.tar.gz binutils-gdb-7d1a9ebbf2b6018657e88172df4356ad4733b9c6.tar.bz2 binutils-gdb-7d1a9ebbf2b6018657e88172df4356ad4733b9c6.zip | |
Remove gcc 3.2 compatibility hacks.
Diffstat (limited to 'gold/common.cc')
| -rw-r--r-- | gold/common.cc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/gold/common.cc b/gold/common.cc index e6f391017d9..286a1128855 100644 --- a/gold/common.cc +++ b/gold/common.cc @@ -90,12 +90,8 @@ Sort_commons<size>::operator()(const Symbol* pa, const Symbol* pb) const return true; const Symbol_table* symtab = this->symtab_; - const Sized_symbol<size>* psa; - psa = symtab->get_sized_symbol SELECT_SIZE_NAME(size) (pa - SELECT_SIZE(size)); - const Sized_symbol<size>* psb; - psb = symtab->get_sized_symbol SELECT_SIZE_NAME(size) (pb - SELECT_SIZE(size)); + const Sized_symbol<size>* psa = symtab->get_sized_symbol<size>(pa); + const Sized_symbol<size>* psb = symtab->get_sized_symbol<size>(pb); typename Sized_symbol<size>::Size_type sa = psa->symsize(); typename Sized_symbol<size>::Size_type sb = psb->symsize(); @@ -171,10 +167,7 @@ Symbol_table::do_allocate_commons(const General_options&, else { any = true; - Sized_symbol<size>* ssym; - ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) ( - sym - SELECT_SIZE(size)); + Sized_symbol<size>* ssym = this->get_sized_symbol<size>(sym); if (ssym->value() > addralign) addralign = ssym->value(); } @@ -205,15 +198,9 @@ Symbol_table::do_allocate_commons(const General_options&, Symbol* sym = *p; if (sym == NULL) break; - - Sized_symbol<size>* ssym; - ssym = this->get_sized_symbol SELECT_SIZE_NAME(size) (sym - SELECT_SIZE(size)); - + Sized_symbol<size>* ssym = this->get_sized_symbol<size>(sym); off = align_address(off, ssym->value()); - ssym->allocate_common(poc, off); - off += ssym->symsize(); } |