espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* arm.cc: Allow combining objects with no EABI version
        information.
This commit is contained in:
Doug Kwan
2010-06-15 23:51:51 +00:00
parent 3de4a297ec
commit 106e8a6ca6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -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> 2010-06-15 Rafael Espindola <espindola@google.com>
* plugin.cc (Plugin_hook::run): Set in_real_elf for the start symbol. * plugin.cc (Plugin_hook::run): Set in_real_elf for the start symbol.

3
gold/arm.cc
View File

@ -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, // v4 and v5 are the same spec before and after it was released,
// so allow mixing them. // 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)) || (v1 == elfcpp::EF_ARM_EABI_VER5 && v2 == elfcpp::EF_ARM_EABI_VER4))
return true; return true;