2010-06-15 Viktor Kutuzov <vkutuzov@accesssoftek.com>

        * arm.cc: Allow combining objects with no EABI version
        information.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index b7bff3b7cfae66b6eca7a4b7cba7b4ceaae22fe0..f5e960ab6ebf267f5c0e88ba2d751de7901443ae 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-15  Viktor Kutuzov  <vkutuzov@accesssoftek.com>
+
+       * arm.cc: Allow combining objects with no EABI version
+       information.
+
 2010-06-15  Rafael Espindola  <espindola@google.com>
 
        * plugin.cc (Plugin_hook::run): Set in_real_elf for the start symbol.

diff --git a/gold/arm.cc b/gold/arm.cc
index f197eafda742af363bbaaf6fc1e1f76b1e0e4924..ff07a90854533392d47e90a59aa054b000244d47 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -9394,7 +9394,8 @@ Target_arm<big_endian>::are_eabi_versions_compatible(
 {
   // v4 and v5 are the same spec before and after it was released,
   // so allow mixing them.
-  if ((v1 == elfcpp::EF_ARM_EABI_VER4 && v2 == elfcpp::EF_ARM_EABI_VER5)
+  if ((v1 == elfcpp::EF_ARM_EABI_UNKNOWN || v2 == elfcpp::EF_ARM_EABI_UNKNOWN)
+      || (v1 == elfcpp::EF_ARM_EABI_VER4 && v2 == elfcpp::EF_ARM_EABI_VER5)
       || (v1 == elfcpp::EF_ARM_EABI_VER5 && v2 == elfcpp::EF_ARM_EABI_VER4))
     return true;