cb347a4
--- a/bfd/opncls.c	2013-03-14 11:25:30.338306122 +0000
cb347a4
+++ b/bfd/opncls.c	2013-03-14 12:20:21.686397360 +0000
cb347a4
@@ -1297,6 +1297,8 @@
cb347a4
       bfd_malloc (strlen (debug_file_directory) + 1
cb347a4
                   + (canon_dirlen > dirlen ? canon_dirlen : dirlen)
cb347a4
                   + strlen (".debug/")
cb347a4
+#define FEDORA_LIB_DEBUG_DIR "/usr/lib/debug/"
cb347a4
+		  + strlen (FEDORA_LIB_DEBUG_DIR) + strlen ("usr/")
cb347a4
                   + strlen (base)
cb347a4
                   + 1);
cb347a4
   if (debugfile == NULL)
cb347a4
@@ -1332,6 +1334,26 @@
cb347a4
   if (check_func (debugfile, crc32))
cb347a4
     goto found;
cb347a4
 
cb347a4
+  /* Then try in the global debug dir for Fedora libraries.  */
cb347a4
+  sprintf (debugfile, "%s%s%s", FEDORA_LIB_DEBUG_DIR, dir, base);
cb347a4
+  if (separate_debug_file_exists (debugfile, crc32))
cb347a4
+    {
cb347a4
+      free (base);
cb347a4
+      free (dir);
cb347a4
+      free (canon_dir);
cb347a4
+      return debugfile;
cb347a4
+    }
cb347a4
+
cb347a4
+  /* Then try in the usr subdirectory of the global debug dir for Fedora libraries.  */
cb347a4
+  sprintf (debugfile, "%s/usr%s%s", FEDORA_LIB_DEBUG_DIR, dir, base);
cb347a4
+  if (separate_debug_file_exists (debugfile, crc32))
cb347a4
+    {
cb347a4
+      free (base);
cb347a4
+      free (dir);
cb347a4
+      free (canon_dir);
cb347a4
+      return debugfile;
cb347a4
+    }
cb347a4
+  
cb347a4
   /* Then try in the global debugfile directory.  */
cb347a4
   strcpy (debugfile, debug_file_directory);
cb347a4
   dirlen = strlen (debug_file_directory) - 1;