 +extern char *build_id_to_filename (struct build_id *build_id,
 +				   char **link_return, int add_debug_suffix);
 +extern void debug_print_missing (const char *binary, const char *debug);
++extern void debug_flush_missing (void);
++#define BUILD_ID_MAIN_EXECUTABLE_FILENAME _("the main executable file")
 +
  /* From dwarf2read.c */
  
  /* Names for a dwarf2 debugging section.  The field NORMAL is the normal
-Only in gdb-7.4/gdb: symfile.h.orig
-diff -rup gdb-7.4-clean/gdb/testsuite/lib/gdb.exp gdb-7.4/gdb/testsuite/lib/gdb.exp
---- gdb-7.4-clean/gdb/testsuite/lib/gdb.exp	2012-01-06 05:54:30.000000000 +0100
-+++ gdb-7.4/gdb/testsuite/lib/gdb.exp	2012-04-02 10:30:11.108170086 +0200
+diff -rup gdb-7.4ori//gdb/testsuite/lib/gdb.exp gdb-7.4/gdb/testsuite/lib/gdb.exp
+--- gdb-7.4ori//gdb/testsuite/lib/gdb.exp	2012-01-06 05:54:30.000000000 +0100
++++ gdb-7.4/gdb/testsuite/lib/gdb.exp	2012-05-10 11:26:26.315643428 +0200
 @@ -1392,6 +1392,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
-+    # Turn off the missing warnings as the testsuite does not expect it.
++    # Turn off the missing RPMs warnings as the testsuite does not expect it.
 +    send_gdb "set build-id-verbose 0\n"
 +    gdb_expect 10 {
 +	-re "$gdb_prompt $" {

     return 0;
 }
 
Only in gdb-7.4/gdb/testsuite/lib: gdb.exp.orig
diff -rup gdb-7.4-clean/gdb/testsuite/lib/mi-support.exp gdb-7.4/gdb/testsuite/lib/mi-support.exp
--- gdb-7.4-clean/gdb/testsuite/lib/mi-support.exp	2012-01-06 05:54:30.000000000 +0100
+++ gdb-7.4/gdb/testsuite/lib/mi-support.exp	2012-04-02 10:30:11.108170086 +0200
@@ -212,6 +212,16 @@ proc default_mi_gdb_start { args } {
 	    warning "Couldn't set the width to 0."
 	}
     }
+    # Turn off the missing warnings as the testsuite does not expect it.
+    send_gdb "190-gdb-set build-id-verbose 0\n"
+    gdb_expect 10 {
+	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {

     }
   return NULL;
 }
@@ -1400,9 +2398,10 @@ elf_symfile_read (struct objfile *objfil
      `.note.gnu.build-id'.  */
   else if (!objfile_has_partial_symbols (objfile))
     {
