Allow mixing target and not-target directives

[deliverable/binutils-gdb.git] / gold / resolve.cc

diff --git a/gold/resolve.cc b/gold/resolve.cc
index 52dae8b9994916177707cdca46d7d021a0f62b94..1c0344c689c6a2b530bc4f4ff735acad54781f2b 100644 (file)
--- a/gold/resolve.cc
+++ b/gold/resolve.cc
@@ -1,6 +1,6 @@
 // resolve.cc -- symbol resolution for gold
 
-// Copyright (C) 2006-2014 Free Software Foundation, Inc.
+// Copyright (C) 2006-2015 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -317,8 +317,8 @@ Symbol_table::resolve(Sized_symbol<size>* to,
          if (to->is_common() && !is_ordinary && st_shndx == elfcpp::SHN_COMMON)
            {
              adjust_common = true;
-             typename Sized_symbol<size>::Size_type tosize = to->symsize();
-             typename Sized_symbol<size>::Value_type tovalue = to->value();
+             tosize = to->symsize();
+             tovalue = to->value();
            }
          this->override(to, sym, st_shndx, is_ordinary, object, version);
          if (adjust_common)