propagate from branch 'com.redhat.elfutils.roland.pending' (head e5cfdd13aa39dfae16b905fd57ff56ad8a131bb5)

            to branch 'com.redhat.elfutils' (head 60222fc1981540f15e674b6705fd7a6f628f95a4)

6 files changed, 11 insertions, 19 deletions

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 69c160a2..d1b2dc6d 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,11 +1,3 @@
-2006-07-12  Ulrich Drepper  <drepper@redhat.com>
-
-	* dwarf_child.c: Adjust for internal_function_def removal.
-	* dwarf_getabbrev.c: Likewise.
-	* dwarf_tag.c: Likewise.
-	* libdw_form.c: Likewise.
-	* memory-access.c: Likewise.
-
 2006-06-28  Roland McGrath  <roland@redhat.com>
 
 	* libdw.map: Export dwfl_linecu, dwfl_line_comp_dir.
diff --git a/libdw/dwarf_child.c b/libdw/dwarf_child.c
index 42b38137..30151e81 100644
--- a/libdw/dwarf_child.c
+++ b/libdw/dwarf_child.c
@@ -1,5 +1,5 @@
 /* Return vhild of current DIE.
-   Copyright (C) 2003, 2004, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -60,7 +60,7 @@
 
 
 unsigned char *
-internal_function
+internal_function_def
 __libdw_find_attr (Dwarf_Die *die, unsigned int search_name,
 		   unsigned int *codep, unsigned int *formp)
 {
diff --git a/libdw/dwarf_getabbrev.c b/libdw/dwarf_getabbrev.c
index 07bf6dfc..7fdbf81c 100644
--- a/libdw/dwarf_getabbrev.c
+++ b/libdw/dwarf_getabbrev.c
@@ -1,5 +1,5 @@
 /* Get abbreviation at given offset.
-   Copyright (C) 2003, 2004, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -58,7 +58,7 @@
 
 
 Dwarf_Abbrev *
-internal_function
+internal_function_def
 __libdw_getabbrev (dbg, cu, offset, lengthp, result)
      Dwarf *dbg;
      struct Dwarf_CU *cu;
diff --git a/libdw/dwarf_tag.c b/libdw/dwarf_tag.c
index 05222821..80d19510 100644
--- a/libdw/dwarf_tag.c
+++ b/libdw/dwarf_tag.c
@@ -1,5 +1,5 @@
 /* Return tag of given DIE.
-   Copyright (C) 2003, 2004, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -56,7 +56,7 @@
 
 
 Dwarf_Abbrev *
-internal_function
+internal_function_def
 __libdw_findabbrev (struct Dwarf_CU *cu, unsigned int code)
 {
   Dwarf_Abbrev *abb;
diff --git a/libdw/libdw_form.c b/libdw/libdw_form.c
index 779b6c0e..bf76fcda 100644
--- a/libdw/libdw_form.c
+++ b/libdw/libdw_form.c
@@ -1,5 +1,5 @@
 /* Helper functions for form handling.
-   Copyright (C) 2003, 2004, 2006 Red Hat, Inc.
+   Copyright (C) 2003, 2004 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -59,7 +59,7 @@
 
 
 size_t
-internal_function
+internal_function_def
 __libdw_form_val_len (Dwarf *dbg, struct Dwarf_CU *cu, unsigned int form,
 		      const unsigned char *valp)
 {
diff --git a/libdw/memory-access.c b/libdw/memory-access.c
index c9a0ca76..0b361a03 100644
--- a/libdw/memory-access.c
+++ b/libdw/memory-access.c
@@ -1,5 +1,5 @@
 /* Out of line functions for memory-access.h macros.
-   Copyright (C) 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2005 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@
 #include "memory-access.h"
 
 uint64_t
-internal_function
+internal_function_def
 __libdw_get_uleb128 (uint64_t acc, unsigned int i, const unsigned char **addrp)
 {
   unsigned char __b;
@@ -62,7 +62,7 @@ __libdw_get_uleb128 (uint64_t acc, unsigned int i, const unsigned char **addrp)
 }
 
 int64_t
-internal_function
+internal_function_def
 __libdw_get_sleb128 (int64_t acc, unsigned int i, const unsigned char **addrp)
 {
   unsigned char __b;