Index: source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
===================================================================
--- source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -972,9 +972,29 @@
     auto ub = m_address_class_map.upper_bound(file_addr);
     if (ub == m_address_class_map.begin())
     {
-        // No entry in the address class map before the address. Return
-        // default address class for an address in a code section.
-        return eAddressClassCode;
+        // No entry in the address class map before the address. Try finding
+        // the address class by using symbol flags, otherwise return default
+        // address class for an address in a code section.
+
+        ArchSpec arch_spec;
+        GetArchitecture(arch_spec);
+        if (arch_spec.GetMachine() != llvm::Triple::arm)
+            return res;
+
+        auto symtab = GetSymtab();
+        if (symtab == nullptr)
+            return res;
+
+        auto symbol = symtab->FindSymbolContainingFileAddress(file_addr);
+        if (symbol == nullptr)
+            return res;
+
+        // Thumb symbols have the lower bit set in the flags field so we just check
+        // for that.
+        if (symbol->GetFlags() & ARM_ELF_SYM_IS_THUMB)
+            res = eAddressClassCodeAlternateISA;
+
+        return res;
     }
 
     // Move iterator to the address class entry preceding address