ChangeLog rotatation and copyright year update

[thirdparty/binutils-gdb.git] / gold / arm.cc

diff --git a/gold/arm.cc b/gold/arm.cc
index 4186a2a7fd587d5ff240f26480ee1e7ac1efe51b..6312cc9aa8d5e4408e8610b9d180741a17f083de 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -1,6 +1,6 @@
 // arm.cc -- arm target support for gold.
 
-// Copyright (C) 2009-2014 Free Software Foundation, Inc.
+// Copyright (C) 2009-2015 Free Software Foundation, Inc.
 // Written by Doug Kwan <dougkwan@google.com> based on the i386 code
 // by Ian Lance Taylor <iant@google.com>.
 // This file also contains borrowed and adapted code from
@@ -10056,7 +10056,7 @@ Target_arm<big_endian>::do_adjust_elf_header(
     if (type == elfcpp::ET_EXEC || type == elfcpp::ET_DYN)
       {
        Object_attribute* attr = this->get_aeabi_object_attribute(elfcpp::Tag_ABI_VFP_args);
-       if (attr->int_value() == AEABI_VFP_args_vfp)
+       if (attr->int_value() == elfcpp::AEABI_VFP_args_vfp)
          flags |= elfcpp::EF_ARM_ABI_FLOAT_HARD;
        else
          flags |= elfcpp::EF_ARM_ABI_FLOAT_SOFT;
@@ -10494,17 +10494,17 @@ Target_arm<big_endian>::merge_object_attributes(
     {
       // Ignore mismatches if the object doesn't use floating point.  */
       if (out_attr[elfcpp::Tag_ABI_FP_number_model].int_value()
-         == AEABI_FP_number_model_none
+         == elfcpp::AEABI_FP_number_model_none
          || (in_attr[elfcpp::Tag_ABI_FP_number_model].int_value()
-             != AEABI_FP_number_model_none
+             != elfcpp::AEABI_FP_number_model_none
              && out_attr[elfcpp::Tag_ABI_VFP_args].int_value()
-                == AEABI_VFP_args_compatible))
+                == elfcpp::AEABI_VFP_args_compatible))
        out_attr[elfcpp::Tag_ABI_VFP_args].set_int_value(
            in_attr[elfcpp::Tag_ABI_VFP_args].int_value());
       else if (in_attr[elfcpp::Tag_ABI_FP_number_model].int_value()
-              != AEABI_FP_number_model_none
+              != elfcpp::AEABI_FP_number_model_none
               && in_attr[elfcpp::Tag_ABI_VFP_args].int_value()
-                 != AEABI_VFP_args_compatible
+                 != elfcpp::AEABI_VFP_args_compatible
               && parameters->options().warn_mismatch())
        gold_error(_("%s uses VFP register arguments, output does not"),
                   name);