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