2010-03-30 Doug Kwan <dougkwan@google.com>

	* arm.cc (Target_arm::using_thumb_only): Handle v6-M

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 0688cdd9cdcf4f7aaa81444a4dd113898b06c7b0..792bd8128ec19787e2a364795202c388e6a350ad 100644 (file)
--- 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 aac5f75d8e6b3354323b0a69fe2aad40a7669943..0f9f1bd1cc158852565db8ae5af87d315da6c155 100644 (file)
--- 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;