Index: source/Host/common/Symbols.cpp
===================================================================
--- source/Host/common/Symbols.cpp
+++ source/Host/common/Symbols.cpp
@@ -40,16 +40,16 @@
 
     FileSpecList debug_file_search_paths (Target::GetDefaultDebugFileSearchPaths());
 
-    // Add module directory.
-    const ConstString &file_dir = module_spec.GetFileSpec().GetDirectory();
-    debug_file_search_paths.AppendIfUnique (FileSpec(file_dir.AsCString("."), true));
-
     // Add current working directory.
     debug_file_search_paths.AppendIfUnique (FileSpec(".", true));
 
     // Add /usr/lib/debug directory.
     debug_file_search_paths.AppendIfUnique (FileSpec("/usr/lib/debug", true));
 
+    // Add module directory.
+    const ConstString &file_dir = module_spec.GetFileSpec().GetDirectory();
+    debug_file_search_paths.AppendIfUnique (FileSpec(file_dir.AsCString("."), true));
+
     std::string uuid_str;
     const UUID &module_uuid = module_spec.GetUUID();
     if (module_uuid.IsValid())
Index: test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
===================================================================
--- test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
@@ -44,7 +44,9 @@
         thread = process.GetThreadAtIndex(0)
         abort_frame_number = 0
         for f in thread.frames:
-            if f.GetFunctionName() == "abort":
+            # We use endswith() to look for abort() since some C libraries mangle the symbol into
+            # __GI_abort or similar.
+            if f.GetFunctionName().endswith("abort"):
                 break
             abort_frame_number = abort_frame_number + 1