Re: [PATCH] Drop unused field struct Dwarf_Files_s.cu

Re: [PATCH] Drop unused field struct Dwarf_Files_s.cu

[Roland McGrath]

[-- Attachment #1: Type: text/plain, Size: 4 bytes --]

OK

Re: [PATCH] Drop unused field struct Dwarf_Files_s.cu

[Petr Machata]

[-- Attachment #1: Type: text/plain, Size: 9 bytes --]

Pushed.

[PATCH] Drop unused field struct Dwarf_Files_s.cu

[Petr Machata]

[-- Attachment #1: Type: text/plain, Size: 1731 bytes --]

Signed-off-by: Petr Machata <pmachata@redhat.com>
---
 libdw/ChangeLog           | 5 +++++
 libdw/dwarf_getsrclines.c | 5 +----
 libdw/libdwP.h            | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index f40ad25..89b2735 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-15  Petr Machata  <pmachata@redhat.com>
+
+	* libdwP.h (struct Dwarf_Files_s.cu): Drop field.
+	* dwarf_getsrclines.c (dwarf_getsrclines): Don't set it.
+
 2014-10-05  Mark Wielaard  <mjw@redhat.com>
 
 	* dwarf.h: Add DW_AT_GNU_deleted.
diff --git a/libdw/dwarf_getsrclines.c b/libdw/dwarf_getsrclines.c
index 7b174cf..74d626c 100644
--- a/libdw/dwarf_getsrclines.c
+++ b/libdw/dwarf_getsrclines.c
@@ -1,5 +1,5 @@
 /* Return line number information of CU.
-   Copyright (C) 2004-2010, 2013 Red Hat, Inc.
+   Copyright (C) 2004-2010, 2013, 2014 Red Hat, Inc.
    This file is part of elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2004.
 
@@ -680,9 +680,6 @@ dwarf_getsrclines (Dwarf_Die *cudie, Dwarf_Lines **lines, size_t *nlines)
 	dirs[i] = dirarray[i]->dir;
       dirs[ndirlist] = NULL;
 
-      /* 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 ce8a83d..c0f3741 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -209,7 +209,6 @@ struct Dwarf_Abbrev
 /* Files in line information records.  */
 struct Dwarf_Files_s
   {
-    struct Dwarf_CU *cu;
     unsigned int ndirs;
     unsigned int nfiles;
     struct Dwarf_Fileinfo_s
-- 
2.1.0