cfb8ad09aa
- Merge from gdb-7.4.50.20120603-3.fc18.src.rpm. * Wed Jun 6 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120603-3.fc18 - Disable -lmcheck in the development builds. - Fix assertion on some files as glibc-2.15.90-8.fc18 (Doug Evans). * Sun Jun 3 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120603-2.fc18 - Fix Release. - Make yum --enablerepo compatible with at least mock-1.1.21-1.fc16 Rawhide cfg. * Sun Jun 3 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120602-1.fc18 - Rebase to FSF GDB 7.4.50.20120602. - [testsuite] BuildRequire gcc-go. - Drop printing 2D C++ vectors as matrices which no longer worked (BZ 562763). - Fix dejagnu-1.5-4.fc17 compatibility for Go (for BZ 635651). - Use librpm.so.3 for rpm-4.10.0 in Fedora 18. - Revert recent breakage of UNIX objfiles order for symbols lookup. * Sat Jun 2 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-48.fc17 - [ppc] Fix hardware watchpoints on PowerPC (BZ 827600, Edjunior Machado). * Mon May 28 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-47.fc17 - Workaround PR libc/14166 for inferior calls of strstr. * Mon May 14 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-46.fc17 - [RHEL5] Workaround doc build race. * Mon May 14 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-45.fc17 - Rename "set auto-load" patchset variable $ddir to $datadir. * Wed May 9 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-44.fc17 OBS-URL: https://build.opensuse.org/request/show/125095 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdb?expand=0&rev=88
106 lines
3.7 KiB
Diff
106 lines
3.7 KiB
Diff
Index: gdb-7.4.50.20120603/gdb/elfread.c
|
|
===================================================================
|
|
--- gdb-7.4.50.20120603.orig/gdb/elfread.c 2012-06-12 15:12:05.000000000 +0200
|
|
+++ gdb-7.4.50.20120603/gdb/elfread.c 2012-06-12 15:13:39.678712939 +0200
|
|
@@ -1809,9 +1809,9 @@ missing_rpm_enlist (const char *filename
|
|
if (h == NULL)
|
|
break;
|
|
|
|
- /* Verify the debuginfo file is not already installed. */
|
|
-
|
|
- debuginfo = headerFormat_p (h, "%{sourcerpm}-debuginfo.%{arch}",
|
|
+ /* The allocated memory gets utilized below for MISSING_RPM_HASH. */
|
|
+ debuginfo = headerFormat_p (h,
|
|
+ "%{name}-debuginfo-%{version}-%{release}.%{arch}",
|
|
&err);
|
|
if (!debuginfo)
|
|
{
|
|
@@ -1819,60 +1819,19 @@ missing_rpm_enlist (const char *filename
|
|
err);
|
|
continue;
|
|
}
|
|
- /* s = `.src.rpm-debuginfo.%{arch}' */
|
|
- s = strrchr (debuginfo, '-') - srcrpmlen;
|
|
- s2 = NULL;
|
|
- if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0)
|
|
- {
|
|
- /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */
|
|
- s2 = memrchr (debuginfo, '-', s - debuginfo);
|
|
- }
|
|
- if (s2)
|
|
- {
|
|
- /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
|
|
- s2 = memrchr (debuginfo, '-', s2 - debuginfo);
|
|
- }
|
|
- if (!s2)
|
|
- {
|
|
- warning (_("Error querying the rpm file `%s': %s"), filename,
|
|
- debuginfo);
|
|
- xfree (debuginfo);
|
|
- continue;
|
|
- }
|
|
- /* s = `.src.rpm-debuginfo.%{arch}' */
|
|
- /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
|
|
- memmove (s2 + debuginfolen, s2, s - s2);
|
|
- memcpy (s2, "-debuginfo", debuginfolen);
|
|
- /* s = `XXXX.%{arch}' */
|
|
- /* strlen ("XXXX") == srcrpmlen + debuginfolen */
|
|
- /* s2 = `-debuginfo-%{version}-%{release}XX.%{arch}' */
|
|
- /* strlen ("XX") == srcrpmlen */
|
|
- memmove (s + debuginfolen, s + srcrpmlen + debuginfolen,
|
|
- strlen (s + srcrpmlen + debuginfolen) + 1);
|
|
- /* s = `-debuginfo-%{version}-%{release}.%{arch}' */
|
|
|
|
+ /* Verify the debuginfo file is not already installed. */
|
|
/* RPMDBI_PACKAGES requires keylen == sizeof (int). */
|
|
/* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel(). */
|
|
mi_debuginfo = rpmtsInitIterator_p (ts, RPMDBI_LABEL, debuginfo, 0);
|
|
- xfree (debuginfo);
|
|
if (mi_debuginfo)
|
|
{
|
|
+ xfree (debuginfo);
|
|
rpmdbFreeIterator_p (mi_debuginfo);
|
|
count = 0;
|
|
break;
|
|
}
|
|
|
|
- /* The allocated memory gets utilized below for MISSING_RPM_HASH. */
|
|
- debuginfo = headerFormat_p (h,
|
|
- "%{name}-%{version}-%{release}.%{arch}",
|
|
- &err);
|
|
- if (!debuginfo)
|
|
- {
|
|
- warning (_("Error querying the rpm file `%s': %s"), filename,
|
|
- err);
|
|
- continue;
|
|
- }
|
|
-
|
|
/* Base package name for `debuginfo-install'. We do not use the
|
|
`yum' command directly as the line
|
|
yum --disablerepo='*' --enablerepo='*debug*' \
|
|
@@ -1958,7 +1917,7 @@ missing_rpm_list_print (void)
|
|
(int (*) (const void *, const void *)) missing_rpm_list_compar);
|
|
|
|
printf_unfiltered (_("Missing separate debuginfos, use: %s"),
|
|
- "debuginfo-install");
|
|
+ "zypper install");
|
|
for (array_iter = array; array_iter < array + missing_rpm_list_entries;
|
|
array_iter++)
|
|
{
|
|
@@ -2171,9 +2130,12 @@ debug_print_missing (const char *binary,
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
_("Missing separate debuginfo for %s\n"), binary);
|
|
if (debug != NULL)
|
|
- fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
|
|
- "yum --disablerepo='*' --enablerepo='*debug*'"
|
|
- " install", debug);
|
|
+ {
|
|
+ const char *p = strrchr (debug, '/');
|
|
+ fprintf_unfiltered (gdb_stdlog, _("Try: %s%.2s%.38s\"\n"),
|
|
+ "zypper install -C \"debuginfo(build-id)=",
|
|
+ p - 2, p + 1);
|
|
+ }
|
|
}
|
|
}
|
|
|