From: Doug Kwan <dougkwan@google.com>
Date: Tue, 15 Jun 2010 23:51:51 +0000 (+0000)
Subject: 2010-06-15  Viktor Kutuzov  <vkutuzov@accesssoftek.com>
X-Git-Tag: gdb_7_2-branchpoint~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106e8a6ca66a1d1b61014307bcc9bb51def042cc;p=thirdparty%2Fbinutils-gdb.git

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 b7bff3b7cfa..f5e960ab6eb 100644
--- 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 f197eafda74..ff07a908545 100644
--- 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;