up to 10.2

[packages/gdb.git] / gdb-6.6-buildid-locate-rpm-scl.patch

diff --git a/gdb-6.6-buildid-locate-rpm-scl.patch b/gdb-6.6-buildid-locate-rpm-scl.patch
index 9200bab22e8549c71cf37d8b4656148a113ecc6b..947b855068a5f91764a7380626f6d20b9baeefc6 100644 (file)
--- a/gdb-6.6-buildid-locate-rpm-scl.patch
+++ b/gdb-6.6-buildid-locate-rpm-scl.patch
@@ -3,23 +3,16 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-buildid-locate-rpm-scl.patch
 
-FileName: gdb-6.6-buildid-locate-rpm-scl.patch
-
 ;; [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 ;;=push+jan
 
 warning: Skipping deprecated .gdb_index section
 https://bugzilla.redhat.com/show_bug.cgi?id=953585
----
- gdb/build-id.c   | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- gdb/dwarf2read.c | 14 ++++++++++++++
- 2 files changed, 68 insertions(+)
 
 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index e2c1e81266..1b75530f91 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -715,7 +715,11 @@ static int missing_rpm_list_entries;
+@@ -742,7 +742,11 @@ static int missing_rpm_list_entries;
  /* Returns the count of newly added rpms.  */
  
  static int
@@ -31,7 +24,7 @@ index e2c1e81266..1b75530f91 100644
  {
    static int rpm_init_done = 0;
    rpmts ts;
-@@ -822,7 +826,11 @@ missing_rpm_enlist (const char *filename)
+@@ -849,7 +853,11 @@ missing_rpm_enlist (const char *filename)
    mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
    if (mi != NULL)
      {
@@ -43,7 +36,7 @@ index e2c1e81266..1b75530f91 100644
        {
          Header h;
          char *debuginfo, **slot, *s, *s2;
-@@ -940,6 +948,37 @@ missing_rpm_enlist (const char *filename)
+@@ -967,6 +975,37 @@ missing_rpm_enlist (const char *filename)
            xfree (debuginfo);
          count++;
        }
@@ -81,10 +74,10 @@ index e2c1e81266..1b75530f91 100644
  
        rpmdbFreeIterator_p (mi);
      }
-@@ -950,6 +989,21 @@ missing_rpm_enlist (const char *filename)
+@@ -976,6 +1015,20 @@ missing_rpm_enlist (const char *filename)
+   return count;
  }
  
- static int
 +#ifdef GDB_INDEX_VERIFY_VENDOR
 +missing_rpm_enlist (const char *filename)
 +{
@@ -97,17 +90,15 @@ index e2c1e81266..1b75530f91 100644
 +{
 +  return missing_rpm_enlist_1 (filename, 1);
 +}
-+
-+static int
 +#endif
- missing_rpm_list_compar (const char *const *ap, const char *const *bp)
++
+ static bool
+ missing_rpm_list_compar (const char *ap, const char *bp)
  {
-   return strcoll (*ap, *bp);
-diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 2c972d5e74..64329af71e 100644
---- a/gdb/dwarf2read.c
-+++ b/gdb/dwarf2read.c
-@@ -3725,6 +3725,16 @@ read_index_from_section (struct objfile *objfile,
+diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
+--- a/gdb/dwarf2/read.c
++++ b/gdb/dwarf2/read.c
+@@ -3022,6 +3022,16 @@ read_gdb_index_from_buffer (const char *filename,
       "set use-deprecated-index-sections on".  */
    if (version < 6 && !deprecated_ok)
      {
@@ -124,7 +115,7 @@ index 2c972d5e74..64329af71e 100644
        static int warning_printed = 0;
        if (!warning_printed)
        {
-@@ -3736,6 +3746,10 @@ to use the section anyway."),
+@@ -3033,6 +3043,10 @@ to use the section anyway."),
          warning_printed = 1;
        }
        return 0;
@@ -135,6 +126,3 @@ index 2c972d5e74..64329af71e 100644
      }
    /* Version 7 indices generated by gold refer to the CU for a symbol instead
       of the TU (for symbols coming from TUs),
--- 
-2.14.3
-