1 --- elfutils-0.127/src/ld.h.orig 2006-07-12 01:20:42.000000000 +0200
2 +++ elfutils-0.127/src/ld.h 2007-05-19 16:13:40.015849251 +0200
4 #ifdef __GNUC_STDC_INLINE__
5 __attribute__ ((__gnu_inline__))
8 +extern __libdw_gnu_inline bool
9 linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
11 struct usedfiles *file = scninfo->fileinfo;
12 --- elfutils-0.127/libdwfl/dwfl_module_getsrc_file.c.orig 2006-04-11 22:52:05.000000000 +0200
13 +++ elfutils-0.127/libdwfl/dwfl_module_getsrc_file.c 2007-05-19 16:09:31.910875393 +0200
16 && (error = __libdwfl_cu_getsrclines (cu)) == DWFL_E_NOERROR)
18 - inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
19 + __libdw_gnu_inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
21 return line->files->info[line->file].name;
23 - inline Dwarf_Line *dwfl_line (const Dwfl_Line *line)
24 + __libdw_gnu_inline Dwarf_Line *dwfl_line (const Dwfl_Line *line)
26 return &dwfl_linecu (line)->die.cu->lines->info[line->idx];
28 - inline const char *dwfl_line_file (const Dwfl_Line *line)
29 + __libdw_gnu_inline const char *dwfl_line_file (const Dwfl_Line *line)
31 return INTUSE(dwarf_line_file) (dwfl_line (line));
33 --- elfutils-0.127/libdwfl/elf-from-memory.c.orig 2007-03-11 03:11:55.000000000 +0100
34 +++ elfutils-0.127/libdwfl/elf-from-memory.c 2007-05-19 16:09:58.174735114 +0200
36 GElf_Addr loadbase = ehdr_vma;
37 switch (ehdr.e32.e_ident[EI_CLASS])
39 - inline void handle_segment (GElf_Addr vaddr, GElf_Off offset,
40 + __libdw_gnu_inline void handle_segment (GElf_Addr vaddr, GElf_Off offset,
41 GElf_Xword filesz, GElf_Xword align)
43 GElf_Off segment_end = ((offset + filesz + align - 1) & -align);
46 switch (ehdr.e32.e_ident[EI_CLASS])
48 - inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
49 + __libdw_gnu_inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
50 GElf_Xword filesz, GElf_Xword align)
52 GElf_Off start = offset & -align;
53 --- elfutils-0.127/libdwfl/argp-std.c.orig 2007-04-05 11:12:36.000000000 +0200
54 +++ elfutils-0.127/libdwfl/argp-std.c 2007-05-19 16:08:04.209055832 +0200
57 parse_opt (int key, char *arg, struct argp_state *state)
59 - inline void failure (Dwfl *dwfl, int errnum, const char *msg)
60 + __libdw_gnu_inline void failure (Dwfl *dwfl, int errnum, const char *msg)
63 argp_failure (state, EXIT_FAILURE, 0, "%s: %s",
68 - inline error_t fail (Dwfl *dwfl, int errnum, const char *msg)
69 + __libdw_gnu_inline error_t fail (Dwfl *dwfl, int errnum, const char *msg)
71 failure (dwfl, errnum, msg);
72 return errnum == -1 ? EIO : errnum;
73 --- elfutils-0.130/libdwfl/linux-kernel-modules.c.orig 2007-10-16 07:21:41.000000000 +0200
74 +++ elfutils-0.130/libdwfl/linux-kernel-modules.c 2007-11-03 15:49:26.814775289 +0100
79 - inline Dwfl_Module *report (void)
80 + __libdw_gnu_inline Dwfl_Module *report (void)
82 return INTUSE(dwfl_report_module) (dwfl, KERNEL_MODNAME, start, end);
85 only '_' and one only using '-'. */
87 char alternate_name[namelen + 1];
88 - inline bool subst_name (char from, char to)
89 + __libdw_gnu_inline bool subst_name (char from, char to)
91 const char *n = memchr (module_name, from, namelen);
93 --- elfutils-0.127/libdwfl/linux-proc-maps.c.orig 2007-04-05 11:12:36.000000000 +0200
94 +++ elfutils-0.127/libdwfl/linux-proc-maps.c 2007-05-19 16:09:02.093611158 +0200
96 char *last_file = NULL;
97 Dwarf_Addr low = 0, high = 0;
99 - inline bool report (void)
100 + __libdw_gnu_inline bool report (void)
102 if (last_file != NULL)
104 --- elfutils-0.127/libdwfl/dwfl_module_addrsym.c.orig 2007-03-04 23:00:19.000000000 +0100
105 +++ elfutils-0.127/libdwfl/dwfl_module_addrsym.c 2007-05-19 16:10:28.605345054 +0200
108 /* Return true iff we consider ADDR to lie in the same section as SYM. */
109 GElf_Word addr_shndx = SHN_UNDEF;
110 - inline bool same_section (const GElf_Sym *sym, GElf_Word shndx)
111 + __libdw_gnu_inline bool same_section (const GElf_Sym *sym, GElf_Word shndx)
113 /* For absolute symbols and the like, only match exactly. */
114 if (shndx >= SHN_LORESERVE)
115 --- elfutils-0.127/backends/ia64_retval.c.orig 2006-07-21 13:28:28.000000000 +0200
116 +++ elfutils-0.127/backends/ia64_retval.c 2007-05-19 16:13:08.295213177 +0200
118 If we find a datum that's not the same FP type as the first datum, punt.
119 If we count more than eight total homogeneous FP data, punt. */
121 - inline int hfa (const Dwarf_Op *loc, int nregs)
122 + __libdw_gnu_inline int hfa (const Dwarf_Op *loc, int nregs)
124 if (fpregs_used == 0)
126 --- elfutils-0.130/libdw/libdw.h.orig 2007-10-16 07:21:41.000000000 +0200
127 +++ elfutils-0.130/libdw/libdw.h 2007-11-03 16:02:19.906831295 +0100
129 # define __nonnull_attribute__(args...)
132 -#ifdef __GNUC_STDC_INLINE__
133 +#if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
134 # define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
135 +# define __libdw_gnu_inline __inline __attribute__ ((__gnu_inline__))
137 # define __libdw_extern_inline extern __inline
138 +# define __libdw_gnu_inline __inline
142 --- elfutils-0.127/libdw/dwarf_getscopevar.c.orig 2006-04-11 22:52:05.000000000 +0200
143 +++ elfutils-0.127/libdw/dwarf_getscopevar.c 2007-05-19 16:11:06.586106385 +0200
145 size_t match_file_len = match_file == NULL ? 0 : strlen (match_file);
146 bool lastfile_matches = false;
147 const char *lastfile = NULL;
148 - inline bool file_matches (Dwarf_Files *files, size_t idx)
149 + __libdw_gnu_inline bool file_matches (Dwarf_Files *files, size_t idx)
151 if (idx >= files->nfiles)
153 --- elfutils-0.127/libdw/libdw_visit_scopes.c.orig 2006-04-11 22:52:05.000000000 +0200
154 +++ elfutils-0.127/libdw/libdw_visit_scopes.c 2007-05-19 16:11:28.309875205 +0200
156 if (INTUSE(dwarf_child) (&root->die, &child.die) != 0)
159 - inline int recurse (void)
160 + __libdw_gnu_inline int recurse (void)
162 return __libdw_visit_scopes (depth + 1, &child,
163 previsit, postvisit, arg);
164 --- elfutils-0.127/libdw/dwarf_entry_breakpoints.c.orig 2006-04-11 22:52:05.000000000 +0200
165 +++ elfutils-0.127/libdw/dwarf_entry_breakpoints.c 2007-05-19 16:12:17.807534209 +0200
169 /* Add one breakpoint location to the result vector. */
170 - inline int add_bkpt (Dwarf_Addr pc)
171 + __libdw_gnu_inline int add_bkpt (Dwarf_Addr pc)
173 Dwarf_Addr *newlist = realloc (*bkpts, ++nbkpts * sizeof newlist[0]);
178 /* Fallback result, break at the entrypc/lowpc value. */
179 - inline int entrypc_bkpt (void)
180 + __libdw_gnu_inline int entrypc_bkpt (void)
183 return INTUSE(dwarf_entrypc) (die, &pc) < 0 ? -1 : add_bkpt (pc);
185 /* Search a contiguous PC range for prologue-end markers.
186 If DWARF, look for proper markers.
187 Failing that, if ADHOC, look for the ad hoc convention. */
188 - inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
189 + __libdw_gnu_inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
190 bool dwarf, bool adhoc)
192 size_t l = 0, u = nlines;
193 --- elfutils-0.135/src/strip.c.orig 2008-05-31 10:15:02.975418315 +0200
194 +++ elfutils-0.135/src/strip.c 2008-05-31 10:28:10.216279777 +0200
195 @@ -1335,7 +1335,7 @@
196 /* Update section headers when the data size has changed.
197 We also update the SHT_NOBITS section in the debug
198 file so that the section headers match in sh_size. */
199 - inline void update_section_size (const Elf_Data *newdata)
200 + __libdw_gnu_inline void update_section_size (const Elf_Data *newdata)
203 GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
204 --- elfutils-0.128/src/unstrip.c.orig 2007-06-06 01:44:33.000000000 +0200
205 +++ elfutils-0.128/src/unstrip.c 2007-06-12 18:51:03.570085226 +0200
208 Elf_Data *data = elf_getdata (outscn, NULL);
210 - inline void adjust_reloc (GElf_Xword *info)
211 + __libdw_gnu_inline void adjust_reloc (GElf_Xword *info)
213 size_t ndx = GELF_R_SYM (*info);
214 if (ndx != STN_UNDEF)
219 - inline void check_match (bool match, Elf_Scn *scn, const char *name)
220 + __libdw_gnu_inline void check_match (bool match, Elf_Scn *scn, const char *name)
224 @@ -1147,7 +1147,7 @@
227 /* Locate a matching unallocated section in SECTIONS. */
228 - inline struct section *find_unalloc_section (const GElf_Shdr *shdr,
229 + __libdw_gnu_inline struct section *find_unalloc_section (const GElf_Shdr *shdr,
232 size_t l = nalloc, u = stripped_shnum - 1;
233 @@ -1983,7 +1983,7 @@
234 handle_implicit_modules (const struct arg_info *info)
236 struct match_module_info mmi = { info->args, NULL, info->match_files };
237 - inline ptrdiff_t next (ptrdiff_t offset)
238 + __libdw_gnu_inline ptrdiff_t next (ptrdiff_t offset)
240 return dwfl_getmodules (info->dwfl, &match_module, &mmi, offset);