Blame SOURCES/gdb-6.6-buildid-locate-rpm-scl.patch

861f93
warning: Skipping deprecated .gdb_index section
861f93
https://bugzilla.redhat.com/show_bug.cgi?id=953585
861f93
861f93
--- gdb-7.5.91.20130407-orig/gdb/dwarf2read.c	2013-04-22 15:47:18.837806752 +0200
861f93
+++ gdb-7.5.91.20130407/gdb/dwarf2read.c	2013-04-22 16:12:55.043171881 +0200
861f93
@@ -2700,6 +2700,14 @@ read_index_from_section (struct objfile
861f93
      "set use-deprecated-index-sections on".  */
861f93
   if (version < 6 && !deprecated_ok)
861f93
     {
861f93
+      extern int rpm_verify_vendor (const char *filename);
861f93
+
861f93
+      /* Red Hat Developer Toolset exception.  */
861f93
+      if (rpm_verify_vendor (filename))
861f93
+	{}
861f93
+      else
861f93
+      {
861f93
+
861f93
       static int warning_printed = 0;
861f93
       if (!warning_printed)
861f93
 	{
861f93
@@ -2711,6 +2719,8 @@ to use the section anyway."),
861f93
 	  warning_printed = 1;
861f93
 	}
861f93
       return 0;
861f93
+
861f93
+      }
861f93
     }
861f93
   /* Version 7 indices generated by gold refer to the CU for a symbol instead
861f93
      of the TU (for symbols coming from TUs).  It's just a performance bug, and
861f93
--- gdb-7.5.91.20130407-orig/gdb/elfread.c	2013-04-22 15:47:18.637807200 +0200
861f93
+++ gdb-7.5.91.20130407/gdb/elfread.c	2013-04-22 16:04:09.259429034 +0200
861f93
@@ -1674,7 +1674,7 @@ static int missing_rpm_list_entries;
861f93
 /* Returns the count of newly added rpms.  */
861f93
 
861f93
 static int
861f93
-missing_rpm_enlist (const char *filename)
861f93
+missing_rpm_enlist_1 (const char *filename, int verify_vendor)
861f93
 {
861f93
   static int rpm_init_done = 0;
861f93
   rpmts ts;
861f93
@@ -1778,7 +1778,7 @@ missing_rpm_enlist (const char *filename
861f93
   mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
861f93
   if (mi != NULL)
861f93
     {
861f93
-      for (;;)
861f93
+      if (!verify_vendor) for (;;)
861f93
 	{
861f93
 	  Header h;
861f93
 	  char *debuginfo, **slot, *s, *s2;
861f93
@@ -1897,6 +1897,35 @@ missing_rpm_enlist (const char *filename
861f93
 	    xfree (debuginfo);
861f93
 	  count++;
861f93
 	}
861f93
+      else /* verify_vendor */
861f93
+	{
861f93
+	  int vendor_pass = 0, vendor_fail = 0;
861f93
+
861f93
+	  for (;;)
861f93
+	    {
861f93
+	      Header h;
861f93
+	      errmsg_t err;
861f93
+	      char *vendor;
861f93
+
861f93
+	      h = rpmdbNextIterator_p (mi);
861f93
+	      if (h == NULL)
861f93
+		break;
861f93
+
861f93
+	      vendor = headerFormat_p (h, "%{vendor}", &err;;
861f93
+	      if (!vendor)
861f93
+		{
861f93
+		  warning (_("Error querying the rpm file `%s': %s"), filename,
861f93
+			   err);
861f93
+		  continue;
861f93
+		}
861f93
+	      if (strcmp (vendor, "Red Hat, Inc.") == 0)
861f93
+		vendor_pass = 1;
861f93
+	      else
861f93
+		vendor_fail = 1;
861f93
+	      xfree (vendor);
861f93
+	    }
861f93
+	  count = vendor_pass != 0 && vendor_fail == 0;
861f93
+	}
861f93
 
861f93
       rpmdbFreeIterator_p (mi);
861f93
     }
861f93
@@ -1907,6 +1936,19 @@ missing_rpm_enlist (const char *filename
861f93
 }
861f93
 
861f93
 static int
861f93
+missing_rpm_enlist (const char *filename)
861f93
+{
861f93
+  return missing_rpm_enlist_1 (filename, 0);
861f93
+}
861f93
+
861f93
+extern int rpm_verify_vendor (const char *filename);
861f93
+int
861f93
+rpm_verify_vendor (const char *filename)
861f93
+{
861f93
+  return missing_rpm_enlist_1 (filename, 1);
861f93
+}
861f93
+
861f93
+static int
861f93
 missing_rpm_list_compar (const char *const *ap, const char *const *bp)
861f93
 {
861f93
   return strcoll (*ap, *bp);