From 106e8a6ca66a1d1b61014307bcc9bb51def042cc Mon Sep 17 00:00:00 2001 From: Doug Kwan Date: Tue, 15 Jun 2010 23:51:51 +0000 Subject: [PATCH] 2010-06-15 Viktor Kutuzov * arm.cc: Allow combining objects with no EABI version information. --- gold/ChangeLog | 5 +++++ gold/arm.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * arm.cc: Allow combining objects with no EABI version + information. + 2010-06-15 Rafael Espindola * 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::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; -- 2.7.4