]> git.pld-linux.org Git - packages/elfutils.git/blame - elfutils-inline.patch
- tests passed on sparc now (sparc64 assumed too, no way to check)
[packages/elfutils.git] / elfutils-inline.patch
CommitLineData
4c0303cb
JB
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
d07e7be6
AM
3@@ -1090,7 +1090,7 @@
4 #ifdef __GNUC_STDC_INLINE__
5 __attribute__ ((__gnu_inline__))
6 #endif
4c0303cb 7-extern inline bool
9b93296e 8+extern __libdw_gnu_inline bool
4c0303cb
JB
9 linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
10 {
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
14@@ -79,15 +79,15 @@
15 && cu != NULL
16 && (error = __libdwfl_cu_getsrclines (cu)) == DWFL_E_NOERROR)
17 {
18- inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
9b93296e 19+ __libdw_gnu_inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
4c0303cb
JB
20 {
21 return line->files->info[line->file].name;
22 }
23- inline Dwarf_Line *dwfl_line (const Dwfl_Line *line)
9b93296e 24+ __libdw_gnu_inline Dwarf_Line *dwfl_line (const Dwfl_Line *line)
4c0303cb
JB
25 {
26 return &dwfl_linecu (line)->die.cu->lines->info[line->idx];
27 }
28- inline const char *dwfl_line_file (const Dwfl_Line *line)
9b93296e 29+ __libdw_gnu_inline const char *dwfl_line_file (const Dwfl_Line *line)
4c0303cb
JB
30 {
31 return INTUSE(dwarf_line_file) (dwfl_line (line));
32 }
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
35@@ -215,7 +215,7 @@
36 GElf_Addr loadbase = ehdr_vma;
37 switch (ehdr.e32.e_ident[EI_CLASS])
38 {
39- inline void handle_segment (GElf_Addr vaddr, GElf_Off offset,
9b93296e 40+ __libdw_gnu_inline void handle_segment (GElf_Addr vaddr, GElf_Off offset,
4c0303cb
JB
41 GElf_Xword filesz, GElf_Xword align)
42 {
43 GElf_Off segment_end = ((offset + filesz + align - 1) & -align);
44@@ -276,7 +276,7 @@
45
46 switch (ehdr.e32.e_ident[EI_CLASS])
47 {
48- inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
9b93296e 49+ __libdw_gnu_inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
4c0303cb
JB
50 GElf_Xword filesz, GElf_Xword align)
51 {
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
55@@ -106,7 +106,7 @@
56 static error_t
57 parse_opt (int key, char *arg, struct argp_state *state)
58 {
59- inline void failure (Dwfl *dwfl, int errnum, const char *msg)
9b93296e 60+ __libdw_gnu_inline void failure (Dwfl *dwfl, int errnum, const char *msg)
4c0303cb
JB
61 {
62 if (errnum == -1)
63 argp_failure (state, EXIT_FAILURE, 0, "%s: %s",
64@@ -116,7 +116,7 @@
65 if (dwfl != NULL)
66 dwfl_end (dwfl);
67 }
68- inline error_t fail (Dwfl *dwfl, int errnum, const char *msg)
9b93296e 69+ __libdw_gnu_inline error_t fail (Dwfl *dwfl, int errnum, const char *msg)
4c0303cb
JB
70 {
71 failure (dwfl, errnum, msg);
72 return errnum == -1 ? EIO : errnum;
9b93296e
JB
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
75@@ -524,7 +524,7 @@
4c0303cb
JB
76 {
77 Dwarf_Addr start;
78 Dwarf_Addr end;
9b93296e
JB
79- inline Dwfl_Module *report (void)
80+ __libdw_gnu_inline Dwfl_Module *report (void)
4c0303cb 81 {
9b93296e
JB
82 return INTUSE(dwfl_report_module) (dwfl, KERNEL_MODNAME, start, end);
83 }
84@@ -611,7 +611,7 @@
4c0303cb
JB
85 only '_' and one only using '-'. */
86
87 char alternate_name[namelen + 1];
88- inline bool subst_name (char from, char to)
9b93296e 89+ __libdw_gnu_inline bool subst_name (char from, char to)
4c0303cb
JB
90 {
91 const char *n = memchr (module_name, from, namelen);
92 if (n == NULL)
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
95@@ -134,7 +134,7 @@
96 char *last_file = NULL;
97 Dwarf_Addr low = 0, high = 0;
98
99- inline bool report (void)
9b93296e 100+ __libdw_gnu_inline bool report (void)
4c0303cb
JB
101 {
102 if (last_file != NULL)
103 {
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
106@@ -59,7 +59,7 @@
107
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)
9b93296e 111+ __libdw_gnu_inline bool same_section (const GElf_Sym *sym, GElf_Word shndx)
4c0303cb
JB
112 {
113 /* For absolute symbols and the like, only match exactly. */
114 if (shndx >= SHN_LORESERVE)
4c0303cb
JB
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
117@@ -96,7 +96,7 @@
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. */
120
121- inline int hfa (const Dwarf_Op *loc, int nregs)
9b93296e 122+ __libdw_gnu_inline int hfa (const Dwarf_Op *loc, int nregs)
4c0303cb
JB
123 {
124 if (fpregs_used == 0)
125 *locp = loc;
9b93296e
JB
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
04248ea3
JB
128@@ -61,10 +61,12 @@
129 # define __nonnull_attribute__(args...)
130 #endif
131
132-#ifdef __GNUC_STDC_INLINE__
133+#if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
9b93296e
JB
134 # define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
135+# define __libdw_gnu_inline __inline __attribute__ ((__gnu_inline__))
04248ea3 136 #else
9b93296e
JB
137 # define __libdw_extern_inline extern __inline
138+# define __libdw_gnu_inline __inline
04248ea3 139 #endif
4c0303cb 140
4c0303cb 141
4c0303cb
JB
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
144@@ -93,7 +93,7 @@
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)
9b93296e 149+ __libdw_gnu_inline bool file_matches (Dwarf_Files *files, size_t idx)
4c0303cb
JB
150 {
151 if (idx >= files->nfiles)
152 return false;
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
155@@ -107,7 +107,7 @@
156 if (INTUSE(dwarf_child) (&root->die, &child.die) != 0)
157 return -1;
158
159- inline int recurse (void)
9b93296e 160+ __libdw_gnu_inline int recurse (void)
4c0303cb
JB
161 {
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
166@@ -64,7 +64,7 @@
167 *bkpts = NULL;
168
169 /* Add one breakpoint location to the result vector. */
170- inline int add_bkpt (Dwarf_Addr pc)
9b93296e 171+ __libdw_gnu_inline int add_bkpt (Dwarf_Addr pc)
4c0303cb
JB
172 {
173 Dwarf_Addr *newlist = realloc (*bkpts, ++nbkpts * sizeof newlist[0]);
174 if (newlist == NULL)
175@@ -80,7 +80,7 @@
176 }
177
178 /* Fallback result, break at the entrypc/lowpc value. */
179- inline int entrypc_bkpt (void)
9b93296e 180+ __libdw_gnu_inline int entrypc_bkpt (void)
4c0303cb
JB
181 {
182 Dwarf_Addr pc;
183 return INTUSE(dwarf_entrypc) (die, &pc) < 0 ? -1 : add_bkpt (pc);
184@@ -107,7 +107,7 @@
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,
9b93296e 189+ __libdw_gnu_inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
4c0303cb
JB
190 bool dwarf, bool adhoc)
191 {
192 size_t l = 0, u = nlines;
0476d4a7
JB
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)
201 {
202 GElf_Shdr shdr_mem;
203 GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
443ad427
JB
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
206@@ -371,7 +371,7 @@
207 {
208 Elf_Data *data = elf_getdata (outscn, NULL);
209
210- inline void adjust_reloc (GElf_Xword *info)
9b93296e 211+ __libdw_gnu_inline void adjust_reloc (GElf_Xword *info)
443ad427
JB
212 {
213 size_t ndx = GELF_R_SYM (*info);
214 if (ndx != STN_UNDEF)
215@@ -988,7 +988,7 @@
216 }
217
218 bool fail = false;
219- inline void check_match (bool match, Elf_Scn *scn, const char *name)
9b93296e 220+ __libdw_gnu_inline void check_match (bool match, Elf_Scn *scn, const char *name)
443ad427
JB
221 {
222 if (!match)
223 {
224@@ -1147,7 +1147,7 @@
225 }
226
227 /* Locate a matching unallocated section in SECTIONS. */
228- inline struct section *find_unalloc_section (const GElf_Shdr *shdr,
9b93296e 229+ __libdw_gnu_inline struct section *find_unalloc_section (const GElf_Shdr *shdr,
443ad427
JB
230 const char *name)
231 {
232 size_t l = nalloc, u = stripped_shnum - 1;
233@@ -1983,7 +1983,7 @@
234 handle_implicit_modules (const struct arg_info *info)
235 {
236 struct match_module_info mmi = { info->args, NULL, info->match_files };
237- inline ptrdiff_t next (ptrdiff_t offset)
9b93296e 238+ __libdw_gnu_inline ptrdiff_t next (ptrdiff_t offset)
443ad427
JB
239 {
240 return dwfl_getmodules (info->dwfl, &match_module, &mmi, offset);
241 }
This page took 0.148493 seconds and 4 git commands to generate.