diff options
| author | Doug Kwan <dougkwan@google.com> | 2010-06-15 23:51:51 +0000 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2010-06-15 23:51:51 +0000 |
| commit | 106e8a6ca66a1d1b61014307bcc9bb51def042cc (patch) | |
| tree | f0c173dfa7cf9ecb0ae5dd7f69c74f475f919268 /gold/arm.cc | |
| parent | 3de4a297ec739ba0111d80a5b9060d9bffc2d899 (diff) | |
| download | gdb-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/arm.cc')
| -rw-r--r-- | gold/arm.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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; |