aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2010-06-15 23:51:51 +0000
committerDoug Kwan <dougkwan@google.com>2010-06-15 23:51:51 +0000
commit106e8a6ca66a1d1b61014307bcc9bb51def042cc (patch)
treef0c173dfa7cf9ecb0ae5dd7f69c74f475f919268 /gold
parent3de4a297ec739ba0111d80a5b9060d9bffc2d899 (diff)
downloadgdb-106e8a6ca66a1d1b61014307bcc9bb51def042cc.zip
gdb-106e8a6ca66a1d1b61014307bcc9bb51def042cc.tar.gz
gdb-106e8a6ca66a1d1b61014307bcc9bb51def042cc.tar.bz2
2010-06-15 Viktor Kutuzov <vkutuzov@accesssoftek.com>
* arm.cc: Allow combining objects with no EABI version information.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/arm.cc3
2 files changed, 7 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index b7bff3b..f5e960a 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 f197eaf..ff07a90 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;