Make the previous commit rpm buildable.
This commit is contained in:
Jan Kratochvil
parent
256c78441d
commit
c736c63719
|
|
@ -1,7 +1,7 @@
|
|||
Index: gdb-7.6/gdb/corelow.c
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/corelow.c 2013-01-31 19:37:37.000000000 +0100
|
||||
+++ gdb-7.6/gdb/corelow.c 2013-07-17 04:14:39.527049942 +0200
|
||||
+++ gdb-7.6/gdb/corelow.c 2013-08-06 16:57:14.832517976 +0200
|
||||
@@ -46,6 +46,9 @@
|
||||
#include "progspace.h"
|
||||
#include "objfiles.h"
|
||||
|
|
@ -95,8 +95,8 @@ Index: gdb-7.6/gdb/corelow.c
|
|||
}
|
||||
Index: gdb-7.6/gdb/doc/gdb.texinfo
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/doc/gdb.texinfo 2013-07-17 04:14:39.159049721 +0200
|
||||
+++ gdb-7.6/gdb/doc/gdb.texinfo 2013-07-17 04:14:39.533049946 +0200
|
||||
--- gdb-7.6.orig/gdb/doc/gdb.texinfo 2013-08-06 16:57:14.531517553 +0200
|
||||
+++ gdb-7.6/gdb/doc/gdb.texinfo 2013-08-06 16:57:14.843517992 +0200
|
||||
@@ -16831,6 +16831,27 @@ information files.
|
||||
|
||||
@end table
|
||||
|
|
@ -128,7 +128,7 @@ Index: gdb-7.6/gdb/doc/gdb.texinfo
|
|||
Index: gdb-7.6/gdb/solib-svr4.c
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/solib-svr4.c 2013-01-31 14:52:52.000000000 +0100
|
||||
+++ gdb-7.6/gdb/solib-svr4.c 2013-07-17 04:14:39.534049946 +0200
|
||||
+++ gdb-7.6/gdb/solib-svr4.c 2013-08-06 16:57:14.917518096 +0200
|
||||
@@ -1224,9 +1224,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
|
||||
continue;
|
||||
}
|
||||
|
|
@ -188,7 +188,7 @@ Index: gdb-7.6/gdb/solib-svr4.c
|
|||
Index: gdb-7.6/gdb/elfread.c
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/elfread.c 2013-03-18 10:20:02.000000000 +0100
|
||||
+++ gdb-7.6/gdb/elfread.c 2013-07-17 05:11:06.785912272 +0200
|
||||
+++ gdb-7.6/gdb/elfread.c 2013-08-06 16:57:19.548524529 +0200
|
||||
@@ -45,6 +45,11 @@
|
||||
#include "regcache.h"
|
||||
#include "bcache.h"
|
||||
|
|
@ -678,18 +678,19 @@ Index: gdb-7.6/gdb/elfread.c
|
|||
|
||||
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
|
||||
cause "/.build-id/..." lookups. */
|
||||
@@ -1134,7 +1567,9 @@ build_id_to_debug_filename (const struct
|
||||
@@ -1134,7 +1567,10 @@ build_id_to_debug_filename (const struct
|
||||
size_t debugdir_len = strlen (debugdir);
|
||||
const gdb_byte *data = build_id->data;
|
||||
size_t size = build_id->size;
|
||||
- char *s;
|
||||
+ unsigned seqno;
|
||||
+ struct stat statbuf_trash;
|
||||
+ char *s, *link0, *link0_resolved;
|
||||
+ /* Initialize it just to avoid a GCC false warning. */
|
||||
+ char *s, *link0 = NULL, *link0_resolved;
|
||||
|
||||
memcpy (link, debugdir, debugdir_len);
|
||||
s = &link[debugdir_len];
|
||||
@@ -1148,37 +1583,256 @@ build_id_to_debug_filename (const struct
|
||||
@@ -1148,37 +1584,256 @@ build_id_to_debug_filename (const struct
|
||||
*s++ = '/';
|
||||
while (size-- > 0)
|
||||
s += sprintf (s, "%02x", (unsigned) *data++);
|
||||
|
|
@ -957,7 +958,7 @@ Index: gdb-7.6/gdb/elfread.c
|
|||
/* Prevent looping on a stripped .debug file. */
|
||||
if (build_id_name != NULL
|
||||
&& filename_cmp (build_id_name, objfile->name) == 0)
|
||||
@@ -1188,7 +1842,7 @@ find_separate_debug_file_by_buildid (str
|
||||
@@ -1188,7 +1843,7 @@ find_separate_debug_file_by_buildid (str
|
||||
xfree (build_id_name);
|
||||
}
|
||||
else if (build_id_name != NULL)
|
||||
|
|
@ -966,7 +967,7 @@ Index: gdb-7.6/gdb/elfread.c
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -1426,9 +2080,10 @@ elf_symfile_read (struct objfile *objfil
|
||||
@@ -1426,9 +2081,10 @@ elf_symfile_read (struct objfile *objfil
|
||||
&& objfile->separate_debug_objfile == NULL
|
||||
&& objfile->separate_debug_objfile_backlink == NULL)
|
||||
{
|
||||
|
|
@ -979,7 +980,7 @@ Index: gdb-7.6/gdb/elfread.c
|
|||
|
||||
if (debugfile == NULL)
|
||||
debugfile = find_separate_debug_file_by_debuglink (objfile);
|
||||
@@ -1442,6 +2097,12 @@ elf_symfile_read (struct objfile *objfil
|
||||
@@ -1442,6 +2098,12 @@ elf_symfile_read (struct objfile *objfil
|
||||
symbol_file_add_separate (abfd, symfile_flags, objfile);
|
||||
do_cleanups (cleanup);
|
||||
}
|
||||
|
|
@ -992,7 +993,7 @@ Index: gdb-7.6/gdb/elfread.c
|
|||
}
|
||||
}
|
||||
|
||||
@@ -1761,4 +2422,16 @@ _initialize_elfread (void)
|
||||
@@ -1761,4 +2423,16 @@ _initialize_elfread (void)
|
||||
|
||||
elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
|
||||
gnu_ifunc_fns_p = &elf_gnu_ifunc_fns;
|
||||
|
|
@ -1012,7 +1013,7 @@ Index: gdb-7.6/gdb/elfread.c
|
|||
Index: gdb-7.6/gdb/symfile.h
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/symfile.h 2013-02-03 17:20:18.000000000 +0100
|
||||
+++ gdb-7.6/gdb/symfile.h 2013-07-17 04:14:39.535049947 +0200
|
||||
+++ gdb-7.6/gdb/symfile.h 2013-08-06 16:57:14.919518099 +0200
|
||||
@@ -593,6 +593,12 @@ void free_symfile_segment_data (struct s
|
||||
|
||||
extern struct cleanup *increment_reading_symtab (void);
|
||||
|
|
@ -1028,8 +1029,8 @@ Index: gdb-7.6/gdb/symfile.h
|
|||
/* Names for a dwarf2 debugging section. The field NORMAL is the normal
|
||||
Index: gdb-7.6/gdb/testsuite/lib/gdb.exp
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/testsuite/lib/gdb.exp 2013-07-17 04:14:38.798049503 +0200
|
||||
+++ gdb-7.6/gdb/testsuite/lib/gdb.exp 2013-07-17 04:14:39.535049947 +0200
|
||||
--- gdb-7.6.orig/gdb/testsuite/lib/gdb.exp 2013-08-06 16:57:14.298517226 +0200
|
||||
+++ gdb-7.6/gdb/testsuite/lib/gdb.exp 2013-08-06 16:57:14.920518100 +0200
|
||||
@@ -1482,6 +1482,16 @@ proc default_gdb_start { } {
|
||||
warning "Couldn't set the width to 0."
|
||||
}
|
||||
|
|
@ -1050,7 +1051,7 @@ Index: gdb-7.6/gdb/testsuite/lib/gdb.exp
|
|||
Index: gdb-7.6/gdb/testsuite/lib/mi-support.exp
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/testsuite/lib/mi-support.exp 2013-01-22 00:57:59.000000000 +0100
|
||||
+++ gdb-7.6/gdb/testsuite/lib/mi-support.exp 2013-07-17 04:14:39.536049948 +0200
|
||||
+++ gdb-7.6/gdb/testsuite/lib/mi-support.exp 2013-08-06 16:57:14.920518100 +0200
|
||||
@@ -212,6 +212,16 @@ proc default_mi_gdb_start { args } {
|
||||
warning "Couldn't set the width to 0."
|
||||
}
|
||||
|
|
@ -1071,7 +1072,7 @@ Index: gdb-7.6/gdb/testsuite/lib/mi-support.exp
|
|||
Index: gdb-7.6/gdb/objfiles.h
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/objfiles.h 2013-02-28 20:00:31.000000000 +0100
|
||||
+++ gdb-7.6/gdb/objfiles.h 2013-07-17 04:14:39.536049948 +0200
|
||||
+++ gdb-7.6/gdb/objfiles.h 2013-08-06 16:57:14.920518100 +0200
|
||||
@@ -432,6 +432,10 @@ struct objfile
|
||||
|
||||
#define OBJF_MAINLINE (1 << 5)
|
||||
|
|
@ -1086,7 +1087,7 @@ Index: gdb-7.6/gdb/objfiles.h
|
|||
Index: gdb-7.6/gdb/testsuite/gdb.base/corefile.exp
|
||||
===================================================================
|
||||
--- gdb-7.6.orig/gdb/testsuite/gdb.base/corefile.exp 2013-01-01 07:33:25.000000000 +0100
|
||||
+++ gdb-7.6/gdb/testsuite/gdb.base/corefile.exp 2013-07-17 04:14:39.536049948 +0200
|
||||
+++ gdb-7.6/gdb/testsuite/gdb.base/corefile.exp 2013-08-06 16:57:14.921518102 +0200
|
||||
@@ -256,3 +256,33 @@ if ![is_remote target] {
|
||||
|
||||
gdb_exit
|
||||
|
|
|
|||
5
gdb.spec
5
gdb.spec
|
|
@ -36,7 +36,7 @@ Version: 7.6
|
|||
|
||||
# The release always contains a leading reserved number, start it at 1.
|
||||
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
|
||||
Release: 33%{?dist}
|
||||
Release: 34%{?dist}
|
||||
|
||||
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
|
||||
Group: Development/Debuggers
|
||||
|
|
@ -1421,6 +1421,9 @@ fi
|
|||
%endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
|
||||
|
||||
%changelog
|
||||
* Tue Aug 6 2013 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.6-34.fc19
|
||||
- Make the previous commit rpm buildable.
|
||||
|
||||
* Tue Aug 6 2013 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.6-33.fc19
|
||||
- Fix yum install command when the binary RPM is missing (BZ 981154).
|
||||
- Fix crash on 'enable count' (Simon Marchi, BZ 993118).
|
||||
|
|
|
|||
Loading…
Reference in New Issue