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