aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/arm.cc4
2 files changed, 8 insertions, 0 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 0688cdd..792bd81 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-30 Doug Kwan <dougkwan@google.com>
+
+ * arm.cc (Target_arm::using_thumb_only): Handle v6-M
+
2010-03-25 Doug Kwan <dougkwan@google.com>
* gold/arm.cc (Arm_exidx_fixup::update_offset_map): Rearrange code
diff --git a/gold/arm.cc b/gold/arm.cc
index aac5f75..0f9f1bd 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -2053,6 +2053,10 @@ class Target_arm : public Sized_target<32, big_endian>
{
Object_attribute* attr =
this->get_aeabi_object_attribute(elfcpp::Tag_CPU_arch);
+
+ if (attr->int_value() == elfcpp::TAG_CPU_ARCH_V6_M
+ || attr->int_value() == elfcpp::TAG_CPU_ARCH_V6S_M)
+ return true;
if (attr->int_value() != elfcpp::TAG_CPU_ARCH_V7
&& attr->int_value() != elfcpp::TAG_CPU_ARCH_V7E_M)
return false;