Jan Kratochvil 05b22fe
warning: Skipping deprecated .gdb_index section
Jan Kratochvil 05b22fe
https://bugzilla.redhat.com/show_bug.cgi?id=953585
Jan Kratochvil 05b22fe
Jan Kratochvil 2c55a54
Index: gdb-7.6.90.20140127/gdb/dwarf2read.c
Jan Kratochvil 2c55a54
===================================================================
Jan Kratochvil 2c55a54
--- gdb-7.6.90.20140127.orig/gdb/dwarf2read.c	2014-02-06 18:28:23.756232026 +0100
Jan Kratochvil 2c55a54
+++ gdb-7.6.90.20140127/gdb/dwarf2read.c	2014-02-06 18:28:48.969259122 +0100
Jan Kratochvil 2c55a54
@@ -3035,6 +3035,14 @@ read_index_from_section (struct objfile
Jan Kratochvil 05b22fe
      "set use-deprecated-index-sections on".  */
Jan Kratochvil 05b22fe
   if (version < 6 && !deprecated_ok)
Jan Kratochvil 05b22fe
     {
Jan Kratochvil 05b22fe
+      extern int rpm_verify_vendor (const char *filename);
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+      /* Red Hat Developer Toolset exception.  */
Jan Kratochvil 05b22fe
+      if (rpm_verify_vendor (filename))
Jan Kratochvil 05b22fe
+	{}
Jan Kratochvil 05b22fe
+      else
Jan Kratochvil 05b22fe
+      {
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
       static int warning_printed = 0;
Jan Kratochvil 05b22fe
       if (!warning_printed)
Jan Kratochvil 05b22fe
 	{
Jan Kratochvil 2c55a54
@@ -3046,6 +3054,8 @@ to use the section anyway."),
Jan Kratochvil 05b22fe
 	  warning_printed = 1;
Jan Kratochvil 05b22fe
 	}
Jan Kratochvil 05b22fe
       return 0;
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+      }
Jan Kratochvil 05b22fe
     }
Jan Kratochvil 05b22fe
   /* Version 7 indices generated by gold refer to the CU for a symbol instead
Jan Kratochvil 2c55a54
      of the TU (for symbols coming from TUs),
Jan Kratochvil 2c55a54
Index: gdb-7.6.90.20140127/gdb/build-id.c
Jan Kratochvil 2c55a54
===================================================================
Jan Kratochvil 2c55a54
--- gdb-7.6.90.20140127.orig/gdb/build-id.c	2014-02-06 18:28:23.758232029 +0100
Jan Kratochvil 2c55a54
+++ gdb-7.6.90.20140127/gdb/build-id.c	2014-02-06 18:28:26.814235312 +0100
Jan Kratochvil 2c55a54
@@ -711,7 +711,7 @@ static int missing_rpm_list_entries;
Jan Kratochvil 05b22fe
 /* Returns the count of newly added rpms.  */
Jan Kratochvil 05b22fe
 
Jan Kratochvil 05b22fe
 static int
Jan Kratochvil 05b22fe
-missing_rpm_enlist (const char *filename)
Jan Kratochvil 05b22fe
+missing_rpm_enlist_1 (const char *filename, int verify_vendor)
Jan Kratochvil 05b22fe
 {
Jan Kratochvil 05b22fe
   static int rpm_init_done = 0;
Jan Kratochvil 05b22fe
   rpmts ts;
Jan Kratochvil 2c55a54
@@ -815,7 +815,7 @@ missing_rpm_enlist (const char *filename
Jan Kratochvil 05b22fe
   mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
Jan Kratochvil 05b22fe
   if (mi != NULL)
Jan Kratochvil 05b22fe
     {
Jan Kratochvil 05b22fe
-      for (;;)
Jan Kratochvil 05b22fe
+      if (!verify_vendor) for (;;)
Jan Kratochvil 05b22fe
 	{
Jan Kratochvil 05b22fe
 	  Header h;
Jan Kratochvil 05b22fe
 	  char *debuginfo, **slot, *s, *s2;
Jan Kratochvil 2c55a54
@@ -933,6 +933,35 @@ missing_rpm_enlist (const char *filename
Jan Kratochvil 05b22fe
 	    xfree (debuginfo);
Jan Kratochvil 05b22fe
 	  count++;
Jan Kratochvil 05b22fe
 	}
Jan Kratochvil 05b22fe
+      else /* verify_vendor */
Jan Kratochvil 05b22fe
+	{
Jan Kratochvil 05b22fe
+	  int vendor_pass = 0, vendor_fail = 0;
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+	  for (;;)
Jan Kratochvil 05b22fe
+	    {
Jan Kratochvil 05b22fe
+	      Header h;
Jan Kratochvil 05b22fe
+	      errmsg_t err;
Jan Kratochvil 05b22fe
+	      char *vendor;
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+	      h = rpmdbNextIterator_p (mi);
Jan Kratochvil 05b22fe
+	      if (h == NULL)
Jan Kratochvil 05b22fe
+		break;
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+	      vendor = headerFormat_p (h, "%{vendor}", &err;;
Jan Kratochvil 05b22fe
+	      if (!vendor)
Jan Kratochvil 05b22fe
+		{
Jan Kratochvil 05b22fe
+		  warning (_("Error querying the rpm file `%s': %s"), filename,
Jan Kratochvil 05b22fe
+			   err);
Jan Kratochvil 05b22fe
+		  continue;
Jan Kratochvil 05b22fe
+		}
Jan Kratochvil 05b22fe
+	      if (strcmp (vendor, "Red Hat, Inc.") == 0)
Jan Kratochvil 05b22fe
+		vendor_pass = 1;
Jan Kratochvil 05b22fe
+	      else
Jan Kratochvil 05b22fe
+		vendor_fail = 1;
Jan Kratochvil 05b22fe
+	      xfree (vendor);
Jan Kratochvil 05b22fe
+	    }
Jan Kratochvil 05b22fe
+	  count = vendor_pass != 0 && vendor_fail == 0;
Jan Kratochvil 05b22fe
+	}
Jan Kratochvil 05b22fe
 
Jan Kratochvil 05b22fe
       rpmdbFreeIterator_p (mi);
Jan Kratochvil 05b22fe
     }
Jan Kratochvil 2c55a54
@@ -943,6 +972,19 @@ missing_rpm_enlist (const char *filename
Jan Kratochvil 05b22fe
 }
Jan Kratochvil 05b22fe
 
Jan Kratochvil 05b22fe
 static int
Jan Kratochvil 05b22fe
+missing_rpm_enlist (const char *filename)
Jan Kratochvil 05b22fe
+{
Jan Kratochvil 05b22fe
+  return missing_rpm_enlist_1 (filename, 0);
Jan Kratochvil 05b22fe
+}
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+extern int rpm_verify_vendor (const char *filename);
Jan Kratochvil 05b22fe
+int
Jan Kratochvil 05b22fe
+rpm_verify_vendor (const char *filename)
Jan Kratochvil 05b22fe
+{
Jan Kratochvil 05b22fe
+  return missing_rpm_enlist_1 (filename, 1);
Jan Kratochvil 05b22fe
+}
Jan Kratochvil 05b22fe
+
Jan Kratochvil 05b22fe
+static int
Jan Kratochvil 05b22fe
 missing_rpm_list_compar (const char *const *ap, const char *const *bp)
Jan Kratochvil 05b22fe
 {
Jan Kratochvil 05b22fe
   return strcoll (*ap, *bp);