[dwz-multifile-rebase] conflict resolution; not pushed
Jan Kratochvil
jan.kratochvil@redhat.com
Sat Jul 14 21:19:00 GMT 2012
Hi Tom,
FYI I made this local merge but I did not push it, do whatever you like with
it.
(What I pushed I also reverted and it was not a GIT-merge so it should be
a nop.)
Jan
-------------- next part --------------
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8ff7dea..a257d9a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -828,14 +828,8 @@ gnulib/import/extra/snippet/arg-nonnull.h gnulib/import/extra/snippet/c++defs.h
gnulib/import/extra/snippet/warn-on-use.h \
gnulib/import/stddef.in.h gnulib/import/inttypes.in.h inline-frame.h skip.h \
common/common-utils.h common/xml-utils.h common/buffer.h common/ptid.h \
-<<<<<<< HEAD
-common/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h gdb_bfd.h
-||||||| merged common ancestors
-common/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h
-=======
common/format.h \
-common/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h
->>>>>>> gdb/master
+common/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h gdb_bfd.h
# Header files that already have srcdir in them, or which are in objdir.
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index f61b32e..e2f3192 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -962,36 +962,15 @@ reset_symtab_globals (void)
If the returned value is NULL there is no blockvector created for
this symtab (you still must call end_symtab_from_static_block).
-<<<<<<< HEAD
-struct symtab *
-end_symtab_full (CORE_ADDR end_addr, struct objfile *objfile, int section,
- int required)
-{
- struct symtab *symtab = NULL;
- struct blockvector *blockvector;
- struct subfile *subfile;
- struct context_stack *cstk;
- struct subfile *nextsub;
-||||||| merged common ancestors
-struct symtab *
-end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
-{
- struct symtab *symtab = NULL;
- struct blockvector *blockvector;
- struct subfile *subfile;
- struct context_stack *cstk;
- struct subfile *nextsub;
-=======
END_ADDR is the same as for end_symtab: the address of the end of the
file's text.
If EXPANDABLE is non-zero the STATIC_BLOCK dictionary is made
expandable. */
->>>>>>> gdb/master
struct block *
end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile,
- int expandable)
+ int expandable, int required)
{
/* Finish the lexical context of the last function in the file; pop
the context stack. */
@@ -1318,7 +1297,7 @@ end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
{
struct block *static_block;
- static_block = end_symtab_get_static_block (end_addr, objfile, 0);
+ static_block = end_symtab_get_static_block (end_addr, objfile, 0, 0);
return end_symtab_from_static_block (static_block, objfile, section, 0);
}
@@ -1330,7 +1309,7 @@ end_expandable_symtab (CORE_ADDR end_addr, struct objfile *objfile,
{
struct block *static_block;
- static_block = end_symtab_get_static_block (end_addr, objfile, 1);
+ static_block = end_symtab_get_static_block (end_addr, objfile, 1, 0);
return end_symtab_from_static_block (static_block, objfile, section, 1);
}
@@ -1402,12 +1381,6 @@ augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab)
reset_symtab_globals ();
}
-struct symtab *
-end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
-{
- return end_symtab_full (end_addr, objfile, section, 0);
-}
-
/* Push a context block. Args are an identifying nesting level
(checkable when you pop it), and the starting PC address of this
context. */
diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index 86d652b..2c1d179 100644
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -260,7 +260,7 @@ extern char *pop_subfile (void);
extern struct block *end_symtab_get_static_block (CORE_ADDR end_addr,
struct objfile *objfile,
- int expandable);
+ int expandable, int required);
extern struct symtab *end_symtab_from_static_block (struct block *static_block,
struct objfile *objfile,
@@ -270,13 +270,6 @@ extern struct symtab *end_symtab_from_static_block (struct block *static_block,
extern struct symtab *end_symtab (CORE_ADDR end_addr,
struct objfile *objfile, int section);
-<<<<<<< HEAD
-extern struct symtab *end_symtab_full (CORE_ADDR end_addr,
- struct objfile *objfile, int section,
- int required);
-
-||||||| merged common ancestors
-=======
extern struct symtab *end_expandable_symtab (CORE_ADDR end_addr,
struct objfile *objfile,
int section);
@@ -284,7 +277,6 @@ extern struct symtab *end_expandable_symtab (CORE_ADDR end_addr,
extern void augment_type_symtab (struct objfile *objfile,
struct symtab *primary_symtab);
->>>>>>> gdb/master
/* Defined in stabsread.c. */
extern void scan_file_globals (struct objfile *objfile);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 433f98e..94571a8 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6778,14 +6778,8 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
it, by scanning the DIE's below the compilation unit. */
get_scope_pc_bounds (cu->dies, &lowpc, &highpc, cu);
-<<<<<<< HEAD
- symtab = end_symtab_full (highpc + baseaddr, objfile,
- SECT_OFF_TEXT (objfile),
- per_cu->imported_symtabs != NULL);
-||||||| merged common ancestors
- symtab = end_symtab (highpc + baseaddr, objfile, SECT_OFF_TEXT (objfile));
-=======
- static_block = end_symtab_get_static_block (highpc + baseaddr, objfile, 0);
+ static_block = end_symtab_get_static_block (highpc + baseaddr, objfile, 0,
+ per_cu->s.imported_symtabs != NULL);
/* If the comp unit has DW_AT_ranges, it may have discontiguous ranges.
Also, DW_AT_ranges may record ranges not belonging to any child DIEs
@@ -6796,7 +6790,6 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
symtab = end_symtab_from_static_block (static_block, objfile,
SECT_OFF_TEXT (objfile), 0);
->>>>>>> gdb/master
if (symtab != NULL)
{
diff --git a/gdb/utils.c b/gdb/utils.c
index 75ee475..a2bc00d 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -26,12 +26,8 @@
#include "event-top.h"
#include "exceptions.h"
#include "gdbthread.h"
-<<<<<<< HEAD
-#include "gdb_bfd.h"
-||||||| merged common ancestors
-=======
#include "fnmatch.h"
->>>>>>> gdb/master
+#include "gdb_bfd.h"
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif /* HAVE_SYS_RESOURCE_H */
More information about the Archer
mailing list