merge of 67f3844b544f03a64b3ac896c19f94744923d76a

     and ba017f6b59b4ad649cf32f4eefdfecca8b31332c

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index d1b2dc6dbd0dd737bfda0a625c5468374d4e139e..69c160a2b6f962f47e2a0b42ab300578ea152872 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,11 @@
+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 30151e8116d8363ad1800558b461c6dda09c7e77..42b38137a4a51646c88bd27e0646246862ba3cfd 100644 (file)
--- a/libdw/dwarf_child.c
+++ b/libdw/dwarf_child.c
@@ -1,5 +1,5 @@
 /* Return vhild of current DIE.
-   Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 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_def
+internal_function
 __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 7fdbf81c323aa404558e7e19440e1d55c763f920..07bf6dfc4a9aa16c7b3852f631d3845d59dff73a 100644 (file)
--- a/libdw/dwarf_getabbrev.c
+++ b/libdw/dwarf_getabbrev.c
@@ -1,5 +1,5 @@
 /* Get abbreviation at given offset.
-   Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 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_def
+internal_function
 __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 80d1951027a7e778893369f3c48427b907daccb7..05222821b8768b9c6b8fdf7d5859ab8a5c8d8390 100644 (file)
--- a/libdw/dwarf_tag.c
+++ b/libdw/dwarf_tag.c
@@ -1,5 +1,5 @@
 /* Return tag of given DIE.
-   Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 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_def
+internal_function
 __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 bf76fcda19a60bb9f137f54d88466306edf0483f..779b6c0e0757bd33228beaa797cd917ee24daf77 100644 (file)
--- a/libdw/libdw_form.c
+++ b/libdw/libdw_form.c
@@ -1,5 +1,5 @@
 /* Helper functions for form handling.
-   Copyright (C) 2003, 2004 Red Hat, Inc.
+   Copyright (C) 2003, 2004, 2006 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_def
+internal_function
 __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 0b361a03e49d77d9221a842a4ffc392f1be58d85..c9a0ca76da76a28220c1af5b9b5867d92286f360 100644 (file)
--- 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 Red Hat, Inc.
+   Copyright (C) 2005, 2006 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_def
+internal_function
 __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_def
+internal_function
 __libdw_get_sleb128 (int64_t acc, unsigned int i, const unsigned char **addrp)
 {
   unsigned char __b;

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index dd0b9b69eecfcfe2d9da1924dfdd4a0a474c0531..dafa98c857e97149e1da4726975d64a7d244c97e 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * cu.c: Adjust for internal_function_def removal.
+       * dwfl_error.c: Likewise.
+       * dwfl_module.c: Likewise.
+       * dwfl_module_getdwarf.c: Likewise.
+       * lines.c: Likewise.
+       * relocate.c: Likewise.
+
 2006-07-11  Ulrich Drepper  <drepper@redhat.com>
 
        * dwfl_module.c (compare_modules): Don't return GElf_Sxword value,

diff --git a/libdwfl/cu.c b/libdwfl/cu.c
index 4c6d876ef24e8f49521aa5a524022d03f5013246..8f01ea6bd2d0cb086d999aaac0e2c6be23d50573 100644 (file)
--- a/libdwfl/cu.c
+++ b/libdwfl/cu.c
@@ -248,7 +248,7 @@ intern_cu (Dwfl_Module *mod, Dwarf_Off cuoff, struct dwfl_cu **result)
 /* Traverse all the CUs in the module.  */
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_nextcu (Dwfl_Module *mod, struct dwfl_cu *lastcu,
                  struct dwfl_cu **cu)
 {
@@ -315,7 +315,7 @@ arangecu (Dwfl_Module *mod, struct dwfl_arange *arange, struct dwfl_cu **cu)
 }
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_addrcu (Dwfl_Module *mod, Dwarf_Addr addr, struct dwfl_cu **cu)
 {
   struct dwfl_arange *arange;

diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
index 891fbf71b369ad4758ac860e7adcdd4e355ec90a..414fbaf434380ca3faa6e3ffa05d6cc14ce9cac5 100644 (file)
--- a/libdwfl/dwfl_error.c
+++ b/libdwfl/dwfl_error.c
@@ -1,5 +1,5 @@
 /* Error handling in libdwfl.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -162,14 +162,14 @@ canonicalize (Dwfl_Error error)
 }
 
 int
-internal_function_def
+internal_function
 __libdwfl_canon_error (Dwfl_Error error)
 {
   return canonicalize (error);
 }
 
 void
-internal_function_def
+internal_function
 __libdwfl_seterrno (Dwfl_Error error)
 {
   int value = canonicalize (error);

diff --git a/libdwfl/dwfl_module.c b/libdwfl/dwfl_module.c
index e3db1e061f0e1e8679551e6f2438268172ee35c7..3ccf8b1616ebb56640e194985cf13d1d8c8c84a2 100644 (file)
--- a/libdwfl/dwfl_module.c
+++ b/libdwfl/dwfl_module.c
@@ -64,7 +64,7 @@ nofree (void *arg __attribute__ ((unused)))
 }
 
 void
-internal_function_def
+internal_function
 __libdwfl_module_free (Dwfl_Module *mod)
 {
   if (mod->lazy_cu_root != NULL)

diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 1688f1e4cc9828f8115f6fe9f72173b4b1f9616e..07248bf78e4d509405c5311e776ea6bfd62ba267 100644 (file)
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -319,7 +319,7 @@ find_symtab (Dwfl_Module *mod)
 
 /* Try to open a libebl backend for MOD.  */
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_module_getebl (Dwfl_Module *mod)
 {
   if (mod->ebl == NULL)

diff --git a/libdwfl/lines.c b/libdwfl/lines.c
index 49005a0d5356e0bb14ae743ddf7ef188a5442424..ed4267fc3c510cf70e70c88900cb5e02421fbefa 100644 (file)
--- a/libdwfl/lines.c
+++ b/libdwfl/lines.c
@@ -1,5 +1,5 @@
 /* Fetch source line info for CU.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
 #include "../libdw/libdwP.h"
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_cu_getsrclines (struct dwfl_cu *cu)
 {
   if (cu->lines == NULL)

diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c
index f0013e3b978f192204dfd48514505aa41d8dbf58..96cedcc344681bc0419738c1948b026410f22c33 100644 (file)
--- a/libdwfl/relocate.c
+++ b/libdwfl/relocate.c
@@ -55,7 +55,7 @@ typedef uint8_t GElf_Byte;
    We update the section header in place to cache the result.  */
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_relocate_value (Dwfl_Module *mod, size_t symshstrndx,
                          Elf32_Word shndx, GElf_Addr *value)
 {
@@ -97,7 +97,7 @@ __libdwfl_relocate_value (Dwfl_Module *mod, size_t symshstrndx,
 }
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_relocate (Dwfl_Module *mod, Elf *debugfile)
 {
   assert (mod->e_type == ET_REL);

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index baf589745ad9a72d11c4224de578bd26c52d9425..77bafae300aa83cd2b669d1ff182d50ebe2a1860 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * elf32_updatefile.c: Adjust for internal_function_def removal.
+       * elf32_updatenull.c: Likewise.
+       * elf_begin.c: Likewise.
+       * elf_getdata.c: Likewise.
+
 2006-07-11  Ulrich Drepper  <drepper@redhat.com>
 
        * libelf.h: Define ELF_T_GNUHASH.

diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index 6eab3cf03f082f81b96d5b552752e13a7e19b397..682536515017aedfd6c74d5aaa492aade8f16fd5 100644 (file)
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -112,7 +112,7 @@ sort_sections (Elf_Scn **scns, Elf_ScnList *list)
 
 
 int
-internal_function_def
+internal_function
 __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 {
   ElfW2(LIBELFBITS,Ehdr) *ehdr;
@@ -444,7 +444,7 @@ fill (int fd, off_t pos, size_t len, char *fillbuf, size_t *filledp)
 
 
 int
-internal_function_def
+internal_function
 __elfw2(LIBELFBITS,updatefile) (Elf *elf, int change_bo, size_t shnum)
 {
   char fillbuf[FILLBUFSIZE];

diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
index 3516c091a4cfbc056e7c21a5762a0176ce1cfe02..3b926c1f27bdb6eda4154290ceb1c72b9e6d5257 100644 (file)
--- a/libelf/elf32_updatenull.c
+++ b/libelf/elf32_updatenull.c
@@ -132,7 +132,7 @@ ELFW(default_ehdr,LIBELFBITS) (Elf *elf, ElfW2(LIBELFBITS,Ehdr) *ehdr,
 
 
 off_t
-internal_function_def
+internal_function
 __elfw2(LIBELFBITS,updatenull) (Elf *elf, int *change_bop, size_t shnum)
 {
   ElfW2(LIBELFBITS,Ehdr) *ehdr = INTUSE(elfw2(LIBELFBITS,getehdr)) (elf);

diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c
index c6ef794773845c79b10170a9c5828bc2db3b6c30..be52f464dceb7de94de34cd9df2e96a6ba83bc63 100644 (file)
--- a/libelf/elf_begin.c
+++ b/libelf/elf_begin.c
@@ -1,5 +1,5 @@
 /* Create descriptor for processing file.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
+   Copyright (C) 1998-2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 1998.
 
@@ -434,7 +434,7 @@ file_read_elf (int fildes, void *map_address, unsigned char *e_ident,
 
 
 Elf *
-internal_function_def
+internal_function
 __libelf_read_mmaped_file (int fildes, void *map_address,  off_t offset,
                           size_t maxsize, Elf_Cmd cmd, Elf *parent)
 {
@@ -702,7 +702,7 @@ read_long_names (Elf *elf)
 
 /* Read the next archive header.  */
 int
-internal_function_def
+internal_function
 __libelf_next_arhdr (elf)
      Elf *elf;
 {

diff --git a/libelf/elf_getdata.c b/libelf/elf_getdata.c
index 5e37cbeb0367e54a5f911c0ec1a4df1f42af93ca..1fa4a17fce1c5465b36561cb5cf85fd14e9e9e33 100644 (file)
--- a/libelf/elf_getdata.c
+++ b/libelf/elf_getdata.c
@@ -215,7 +215,7 @@ convert_data (Elf_Scn *scn, int version __attribute__ ((unused)), int eclass,
 
 /* Store the information for the raw data in the `rawdata' element.  */
 int
-internal_function_def
+internal_function
 __libelf_set_rawdata (Elf_Scn *scn)
 {
   size_t offset;