diff options
| author | Roland McGrath <[email protected]> | 2009-01-28 18:29:39 -0800 |
|---|---|---|
| committer | Roland McGrath <[email protected]> | 2009-01-28 18:29:39 -0800 |
| commit | 658674e222fa538f365a713e53403ee9aea94ba1 (patch) | |
| tree | 4f706f6cd6fd3c48ca0d2110917290f173ab5259 /libdw | |
| parent | 4edd9103e2bb44b8d94f6f2f89aa373fc1ebc392 (diff) | |
| parent | c5acb304d81cdbe3f8b923f2a6ac1bee3af9f498 (diff) | |
Merge commit 'origin/master' into dwarf
Conflicts:
src/ChangeLog
Diffstat (limited to 'libdw')
| -rw-r--r-- | libdw/ChangeLog | 4 | ||||
| -rw-r--r-- | libdw/dwarf_getsrclines.c | 6 | ||||
| -rw-r--r-- | libdw/libdwP.h | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index a1f776a1..da396caf 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2009-01-28 Roland McGrath <[email protected]> + + * libdwP.h (struct Dwarf_Files_s): Replace dbg field with cu field. + 2009-01-26 Roland McGrath <[email protected]> * c++/dwarf (dwarf_output): Renamed to dwarf_edit and moved to ... diff --git a/libdw/dwarf_getsrclines.c b/libdw/dwarf_getsrclines.c index 9b3c97af..fe0e67d6 100644 --- a/libdw/dwarf_getsrclines.c +++ b/libdw/dwarf_getsrclines.c @@ -1,5 +1,5 @@ /* Return line number information of CU. - Copyright (C) 2004, 2005, 2007, 2008 Red Hat, Inc. + Copyright (C) 2004-2009 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <[email protected]>, 2004. @@ -634,8 +634,8 @@ dwarf_getsrclines (Dwarf_Die *cudie, Dwarf_Lines **lines, size_t *nlines) dirs[i] = dirarray[i]->dir; dirs[ndirlist] = NULL; - /* Remember the debugging descriptor. */ - files->dbg = dbg; + /* Remember the referring CU. */ + files->cu = cu; /* Make the file data structure available through the CU. */ cu->files = files; diff --git a/libdw/libdwP.h b/libdw/libdwP.h index 4ccae9e9..462f349a 100644 --- a/libdw/libdwP.h +++ b/libdw/libdwP.h @@ -1,5 +1,5 @@ /* Internal definitions for libdwarf. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Red Hat, Inc. + Copyright (C) 2002-2009 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <[email protected]>, 2002. @@ -208,7 +208,7 @@ struct Dwarf_Abbrev /* Files in line information records. */ struct Dwarf_Files_s { - Dwarf *dbg; + struct Dwarf_CU *cu; unsigned int ndirs; unsigned int nfiles; struct Dwarf_Fileinfo_s |