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

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