diff options
| author | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
| commit | 2ea97941102380c28117882600265c1187c6fc8b (patch) | |
| tree | 8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/expression.cc | |
| parent | ab8e2090b6435823d50b29b7a255140ba6ea673f (diff) | |
| download | fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.zip fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.bz2 | |
Revert -Wshadow changes, all changes from:
2009-12-11 Doug Kwan <dougkwan@google.com>
2009-12-11 Nick Clifton <nickc@redhat.com>
* configure.ac: Remove -Wshadow when setting WARN_CXXFLAGS.
Diffstat (limited to 'gold/expression.cc')
| -rw-r--r-- | gold/expression.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gold/expression.cc b/gold/expression.cc index 8bbcfaa..853a698 100644 --- a/gold/expression.cc +++ b/gold/expression.cc @@ -1,6 +1,6 @@ // expression.cc -- expressions in linker scripts for gold -// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008 Free Software Foundation, Inc. // Written by Ian Lance Taylor <iant@google.com>. // This file is part of gold. @@ -739,10 +739,10 @@ class Align_expression : public Binary_expression && parameters->options().relocatable()) gold_warning(_("aligning to section relative value")); - uint64_t val = this->left_value(eei, eei->result_section_pointer); + uint64_t value = this->left_value(eei, eei->result_section_pointer); if (align <= 1) - return val; - return ((val + align - 1) / align) * align; + return value; + return ((value + align - 1) / align) * align; } void @@ -768,10 +768,10 @@ class Assert_expression : public Unary_expression uint64_t value(const Expression_eval_info* eei) { - uint64_t val = this->arg_value(eei, eei->result_section_pointer); - if (!val && eei->check_assertions) + uint64_t value = this->arg_value(eei, eei->result_section_pointer); + if (!value && eei->check_assertions) gold_error("%s", this->message_.c_str()); - return val; + return value; } void |