[packages/elfutils.git] / elfutils-inline.patch

--- elfutils-0.127/src/ld.h.orig	2006-07-12 01:20:42.000000000 +0200
+++ elfutils-0.127/src/ld.h	2007-05-19 16:13:40.015849251 +0200
@@ -1090,7 +1090,7 @@
 #ifdef __GNUC_STDC_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
-extern inline bool
+extern __libdw_gnu_inline bool
 linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
 {
   struct usedfiles *file = scninfo->fileinfo;
--- elfutils-0.127/libdwfl/dwfl_module_getsrc_file.c.orig	2006-04-11 22:52:05.000000000 +0200
+++ elfutils-0.127/libdwfl/dwfl_module_getsrc_file.c	2007-05-19 16:09:31.910875393 +0200
@@ -79,15 +79,15 @@
 	 && cu != NULL
 	 && (error = __libdwfl_cu_getsrclines (cu)) == DWFL_E_NOERROR)
     {
-      inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
+      __libdw_gnu_inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
 	{
 	  return line->files->info[line->file].name;
 	}
-      inline Dwarf_Line *dwfl_line (const Dwfl_Line *line)
+      __libdw_gnu_inline Dwarf_Line *dwfl_line (const Dwfl_Line *line)
 	{
 	  return &dwfl_linecu (line)->die.cu->lines->info[line->idx];
 	}
-      inline const char *dwfl_line_file (const Dwfl_Line *line)
+      __libdw_gnu_inline const char *dwfl_line_file (const Dwfl_Line *line)
 	{
 	  return INTUSE(dwarf_line_file) (dwfl_line (line));
 	}
--- elfutils-0.164/libdwfl/elf-from-memory.c.orig	2015-10-12 12:22:58.000000000 +0200
+++ elfutils-0.164/libdwfl/elf-from-memory.c	2015-10-24 13:03:45.371641718 +0200
@@ -223,7 +223,7 @@
 	 segments_end, segments_end_mem and loadbase (if not
 	 found_base yet).  Returns true if sanity checking failed,
 	 false otherwise.  */
-      inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
+      __libdw_gnu_inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
 				  GElf_Xword filesz, GElf_Xword memsz)
 	{
 	  /* Sanity check the segment load aligns with the pagesize.  */
@@ -303,7 +303,7 @@
     {
       /* Reads the given segment.  Returns true if reading fails,
 	 false otherwise.  */
-      inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
+      __libdw_gnu_inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
 				  GElf_Xword filesz)
 	{
 	  GElf_Off start = offset & -pagesize;
--- elfutils-0.127/libdwfl/argp-std.c.orig	2007-04-05 11:12:36.000000000 +0200
+++ elfutils-0.127/libdwfl/argp-std.c	2007-05-19 16:08:04.209055832 +0200
@@ -106,7 +106,7 @@
 static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
-  inline void failure (Dwfl *dwfl, int errnum, const char *msg)
+  __libdw_gnu_inline void failure (Dwfl *dwfl, int errnum, const char *msg)
     {
       if (errnum == -1)
 	argp_failure (state, EXIT_FAILURE, 0, "%s: %s",
@@ -116,7 +116,7 @@
       if (dwfl != NULL)
 	dwfl_end (dwfl);
     }
-  inline error_t fail (Dwfl *dwfl, int errnum, const char *msg)
+  __libdw_gnu_inline error_t fail (Dwfl *dwfl, int errnum, const char *msg)
     {
       failure (dwfl, errnum, msg);
       return errnum == -1 ? EIO : errnum;
--- elfutils-0.127/libdwfl/linux-proc-maps.c.orig	2007-04-05 11:12:36.000000000 +0200
+++ elfutils-0.127/libdwfl/linux-proc-maps.c	2007-05-19 16:09:02.093611158 +0200
@@ -134,7 +134,7 @@
   char *last_file = NULL;
   Dwarf_Addr low = 0, high = 0;
 
-  inline bool report (void)
+  __libdw_gnu_inline bool report (void)
     {
       if (last_file != NULL)
 	{
--- elfutils-0.159/libdwfl/dwfl_module_addrsym.c.orig	2014-06-14 14:36:48.425126218 +0200
+++ elfutils-0.159/libdwfl/dwfl_module_addrsym.c	2014-06-14 14:42:22.541785921 +0200
@@ -44,7 +44,7 @@ __libdwfl_addrsym (Dwfl_Module *mod, GEl
   /* Return true iff we consider ADDR to lie in the same section as SYM.  */
   GElf_Word addr_shndx = SHN_UNDEF;
   Elf *addr_symelf = NULL;
-  inline bool same_section (GElf_Addr value, Elf *symelf, GElf_Word shndx)
+  __libdw_gnu_inline bool same_section (GElf_Addr value, Elf *symelf, GElf_Word shndx)
     {
       /* For absolute symbols and the like, only match exactly.  */
       if (shndx >= SHN_LORESERVE)
--- elfutils-0.127/backends/ia64_retval.c.orig	2006-07-21 13:28:28.000000000 +0200
+++ elfutils-0.127/backends/ia64_retval.c	2007-05-19 16:13:08.295213177 +0200
@@ -96,7 +96,7 @@
      If we find a datum that's not the same FP type as the first datum, punt.
      If we count more than eight total homogeneous FP data, punt.  */
 
-  inline int hfa (const Dwarf_Op *loc, int nregs)
+  __libdw_gnu_inline int hfa (const Dwarf_Op *loc, int nregs)
     {
       if (fpregs_used == 0)
 	*locp = loc;
--- elfutils-0.130/libdw/libdw.h.orig	2007-10-16 07:21:41.000000000 +0200
+++ elfutils-0.130/libdw/libdw.h	2007-11-03 16:02:19.906831295 +0100
@@ -61,10 +61,12 @@
 # define __nonnull_attribute__(args...)
 #endif
 
-#ifdef __GNUC_STDC_INLINE__
+#if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
 # define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
+# define __libdw_gnu_inline __inline __attribute__ ((__gnu_inline__))
 #else
 # define __libdw_extern_inline extern __inline
+# define __libdw_gnu_inline __inline
 #endif
 
 
--- elfutils-0.127/libdw/dwarf_getscopevar.c.orig	2006-04-11 22:52:05.000000000 +0200
+++ elfutils-0.127/libdw/dwarf_getscopevar.c	2007-05-19 16:11:06.586106385 +0200
@@ -93,7 +93,7 @@
   size_t match_file_len = match_file == NULL ? 0 : strlen (match_file);
   bool lastfile_matches = false;
   const char *lastfile = NULL;
-  inline bool file_matches (Dwarf_Files *files, size_t idx)
+  __libdw_gnu_inline bool file_matches (Dwarf_Files *files, size_t idx)
     {
       if (idx >= files->nfiles)
 	return false;
--- elfutils-0.127/libdw/libdw_visit_scopes.c.orig	2006-04-11 22:52:05.000000000 +0200
+++ elfutils-0.127/libdw/libdw_visit_scopes.c	2007-05-19 16:11:28.309875205 +0200
@@ -107,7 +107,7 @@
   if (INTUSE(dwarf_child) (&root->die, &child.die) != 0)
     return -1;
 
-  inline int recurse (void)
+  __libdw_gnu_inline int recurse (void)
     {
       return __libdw_visit_scopes (depth + 1, &child,
 				   previsit, postvisit, arg);
--- elfutils-0.127/libdw/dwarf_entry_breakpoints.c.orig	2006-04-11 22:52:05.000000000 +0200
+++ elfutils-0.127/libdw/dwarf_entry_breakpoints.c	2007-05-19 16:12:17.807534209 +0200
@@ -64,7 +64,7 @@
   *bkpts = NULL;
 
   /* Add one breakpoint location to the result vector.  */
-  inline int add_bkpt (Dwarf_Addr pc)
+  __libdw_gnu_inline int add_bkpt (Dwarf_Addr pc)
     {
       Dwarf_Addr *newlist = realloc (*bkpts, ++nbkpts * sizeof newlist[0]);
       if (newlist == NULL)
@@ -80,7 +80,7 @@
     }
 
   /* Fallback result, break at the entrypc/lowpc value.  */
-  inline int entrypc_bkpt (void)
+  __libdw_gnu_inline int entrypc_bkpt (void)
     {
       Dwarf_Addr pc;
       return INTUSE(dwarf_entrypc) (die, &pc) < 0 ? -1 : add_bkpt (pc);
@@ -107,7 +107,7 @@
   /* Search a contiguous PC range for prologue-end markers.
      If DWARF, look for proper markers.
      Failing that, if ADHOC, look for the ad hoc convention.  */
-  inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
+  __libdw_gnu_inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
 			   bool dwarf, bool adhoc)
     {
       size_t l = 0, u = nlines;
--- elfutils-0.135/src/strip.c.orig	2008-05-31 10:15:02.975418315 +0200
+++ elfutils-0.135/src/strip.c	2008-05-31 10:28:10.216279777 +0200
@@ -1335,7 +1335,7 @@
 	/* Update section headers when the data size has changed.
 	   We also update the SHT_NOBITS section in the debug
 	   file so that the section headers match in sh_size.  */
-	inline void update_section_size (const Elf_Data *newdata)
+	__libdw_gnu_inline void update_section_size (const Elf_Data *newdata)
 	{
 	  GElf_Shdr shdr_mem;
 	  GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
--- elfutils-0.128/src/unstrip.c.orig	2007-06-06 01:44:33.000000000 +0200
+++ elfutils-0.128/src/unstrip.c	2007-06-12 18:51:03.570085226 +0200
@@ -371,7 +371,7 @@
 {
   Elf_Data *data = elf_getdata (outscn, NULL);
 
-  inline void adjust_reloc (GElf_Xword *info)
+  __libdw_gnu_inline void adjust_reloc (GElf_Xword *info)
     {
       size_t ndx = GELF_R_SYM (*info);
       if (ndx != STN_UNDEF)
@@ -988,7 +988,7 @@
     }
 
   bool fail = false;
-  inline void check_match (bool match, Elf_Scn *scn, const char *name)
+  __libdw_gnu_inline void check_match (bool match, Elf_Scn *scn, const char *name)
     {
       if (!match)
 	{
@@ -1147,7 +1147,7 @@
     }
 
   /* Locate a matching unallocated section in SECTIONS.  */
-  inline struct section *find_unalloc_section (const GElf_Shdr *shdr,
+  __libdw_gnu_inline struct section *find_unalloc_section (const GElf_Shdr *shdr,
 					       const char *name)
     {
       size_t l = nalloc, u = stripped_shnum - 1;
@@ -1983,7 +1983,7 @@
 handle_implicit_modules (const struct arg_info *info)
 {
   struct match_module_info mmi = { info->args, NULL, info->match_files };
-  inline ptrdiff_t next (ptrdiff_t offset)
+  __libdw_gnu_inline ptrdiff_t next (ptrdiff_t offset)
     {
       return dwfl_getmodules (info->dwfl, &match_module, &mmi, offset);
     }
Commit	Line	Data
4c0303cb JB	1	--- elfutils-0.127/src/ld.h.orig 2006-07-12 01:20:42.000000000 +0200
4c0303cb JB	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	}
6d3fd36e JB	33	--- elfutils-0.164/libdwfl/elf-from-memory.c.orig 2015-10-12 12:22:58.000000000 +0200
	34	+++ elfutils-0.164/libdwfl/elf-from-memory.c 2015-10-24 13:03:45.371641718 +0200
	35	@@ -223,7 +223,7 @@
df444565 JB	36	segments_end, segments_end_mem and loadbase (if not
	37	found_base yet). Returns true if sanity checking failed,
	38	false otherwise. */
	39	- inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
	40	+ __libdw_gnu_inline bool handle_segment (GElf_Addr vaddr, GElf_Off offset,
6d3fd36e	41	GElf_Xword filesz, GElf_Xword memsz)
4c0303cb	42	{
6d3fd36e JB	43	/* Sanity check the segment load aligns with the pagesize. */
6d3fd36e JB	44	@@ -303,7 +303,7 @@
4c0303cb	45	{
df444565 JB	46	/* Reads the given segment. Returns true if reading fails,
df444565 JB	47	false otherwise. */
4c0303cb	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,
df444565	50	GElf_Xword filesz)
4c0303cb	51	{
df444565	52	GElf_Off start = offset & -pagesize;
4c0303cb JB	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;
4c0303cb JB	73	--- elfutils-0.127/libdwfl/linux-proc-maps.c.orig 2007-04-05 11:12:36.000000000 +0200
	74	+++ elfutils-0.127/libdwfl/linux-proc-maps.c 2007-05-19 16:09:02.093611158 +0200
	75	@@ -134,7 +134,7 @@
	76	char *last_file = NULL;
	77	Dwarf_Addr low = 0, high = 0;
	78
	79	- inline bool report (void)
9b93296e	80	+ __libdw_gnu_inline bool report (void)
4c0303cb JB	81	{
	82	if (last_file != NULL)
	83	{
df444565 JB	84	--- elfutils-0.159/libdwfl/dwfl_module_addrsym.c.orig 2014-06-14 14:36:48.425126218 +0200
	85	+++ elfutils-0.159/libdwfl/dwfl_module_addrsym.c 2014-06-14 14:42:22.541785921 +0200
	86	@@ -44,7 +44,7 @@ __libdwfl_addrsym (Dwfl_Module *mod, GEl
4c0303cb JB	87	/* Return true iff we consider ADDR to lie in the same section as SYM. */
4c0303cb JB	88	GElf_Word addr_shndx = SHN_UNDEF;
df444565 JB	89	Elf *addr_symelf = NULL;
	90	- inline bool same_section (GElf_Addr value, Elf *symelf, GElf_Word shndx)
	91	+ __libdw_gnu_inline bool same_section (GElf_Addr value, Elf *symelf, GElf_Word shndx)
4c0303cb JB	92	{
4c0303cb JB	93	/* For absolute symbols and the like, only match exactly. */
df444565	94	if (shndx >= SHN_LORESERVE)
4c0303cb JB	95	--- elfutils-0.127/backends/ia64_retval.c.orig 2006-07-21 13:28:28.000000000 +0200
	96	+++ elfutils-0.127/backends/ia64_retval.c 2007-05-19 16:13:08.295213177 +0200
	97	@@ -96,7 +96,7 @@
	98	If we find a datum that's not the same FP type as the first datum, punt.
	99	If we count more than eight total homogeneous FP data, punt. */
	100
	101	- inline int hfa (const Dwarf_Op *loc, int nregs)
9b93296e	102	+ __libdw_gnu_inline int hfa (const Dwarf_Op *loc, int nregs)
4c0303cb JB	103	{
	104	if (fpregs_used == 0)
	105	*locp = loc;
9b93296e JB	106	--- elfutils-0.130/libdw/libdw.h.orig 2007-10-16 07:21:41.000000000 +0200
9b93296e JB	107	+++ elfutils-0.130/libdw/libdw.h 2007-11-03 16:02:19.906831295 +0100
04248ea3 JB	108	@@ -61,10 +61,12 @@
	109	# define __nonnull_attribute__(args...)
	110	#endif
	111
	112	-#ifdef __GNUC_STDC_INLINE__
	113	+#if defined(__GNUC_STDC_INLINE__) \|\| defined(__GNUC_GNU_INLINE__)
9b93296e JB	114	# define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
9b93296e JB	115	+# define __libdw_gnu_inline __inline __attribute__ ((__gnu_inline__))
04248ea3	116	#else
9b93296e JB	117	# define __libdw_extern_inline extern __inline
9b93296e JB	118	+# define __libdw_gnu_inline __inline
04248ea3	119	#endif
4c0303cb	120
4c0303cb	121
4c0303cb JB	122	--- elfutils-0.127/libdw/dwarf_getscopevar.c.orig 2006-04-11 22:52:05.000000000 +0200
	123	+++ elfutils-0.127/libdw/dwarf_getscopevar.c 2007-05-19 16:11:06.586106385 +0200
	124	@@ -93,7 +93,7 @@
	125	size_t match_file_len = match_file == NULL ? 0 : strlen (match_file);
	126	bool lastfile_matches = false;
	127	const char *lastfile = NULL;
	128	- inline bool file_matches (Dwarf_Files *files, size_t idx)
9b93296e	129	+ __libdw_gnu_inline bool file_matches (Dwarf_Files *files, size_t idx)
4c0303cb JB	130	{
	131	if (idx >= files->nfiles)
	132	return false;
	133	--- elfutils-0.127/libdw/libdw_visit_scopes.c.orig 2006-04-11 22:52:05.000000000 +0200
	134	+++ elfutils-0.127/libdw/libdw_visit_scopes.c 2007-05-19 16:11:28.309875205 +0200
	135	@@ -107,7 +107,7 @@
	136	if (INTUSE(dwarf_child) (&root->die, &child.die) != 0)
	137	return -1;
	138
	139	- inline int recurse (void)
9b93296e	140	+ __libdw_gnu_inline int recurse (void)
4c0303cb JB	141	{
	142	return __libdw_visit_scopes (depth + 1, &child,
	143	previsit, postvisit, arg);
	144	--- elfutils-0.127/libdw/dwarf_entry_breakpoints.c.orig 2006-04-11 22:52:05.000000000 +0200
	145	+++ elfutils-0.127/libdw/dwarf_entry_breakpoints.c 2007-05-19 16:12:17.807534209 +0200
	146	@@ -64,7 +64,7 @@
	147	*bkpts = NULL;
	148
	149	/* Add one breakpoint location to the result vector. */
	150	- inline int add_bkpt (Dwarf_Addr pc)
9b93296e	151	+ __libdw_gnu_inline int add_bkpt (Dwarf_Addr pc)
4c0303cb JB	152	{
	153	Dwarf_Addr newlist = realloc (bkpts, ++nbkpts * sizeof newlist[0]);
	154	if (newlist == NULL)
	155	@@ -80,7 +80,7 @@
	156	}
	157
	158	/* Fallback result, break at the entrypc/lowpc value. */
	159	- inline int entrypc_bkpt (void)
9b93296e	160	+ __libdw_gnu_inline int entrypc_bkpt (void)
4c0303cb JB	161	{
	162	Dwarf_Addr pc;
	163	return INTUSE(dwarf_entrypc) (die, &pc) < 0 ? -1 : add_bkpt (pc);
	164	@@ -107,7 +107,7 @@
	165	/* Search a contiguous PC range for prologue-end markers.
	166	If DWARF, look for proper markers.
	167	Failing that, if ADHOC, look for the ad hoc convention. */
	168	- inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
9b93296e	169	+ __libdw_gnu_inline int search_range (Dwarf_Addr low, Dwarf_Addr high,
4c0303cb JB	170	bool dwarf, bool adhoc)
	171	{
	172	size_t l = 0, u = nlines;
0476d4a7 JB	173	--- elfutils-0.135/src/strip.c.orig 2008-05-31 10:15:02.975418315 +0200
	174	+++ elfutils-0.135/src/strip.c 2008-05-31 10:28:10.216279777 +0200
	175	@@ -1335,7 +1335,7 @@
	176	/* Update section headers when the data size has changed.
	177	We also update the SHT_NOBITS section in the debug
	178	file so that the section headers match in sh_size. */
	179	- inline void update_section_size (const Elf_Data *newdata)
	180	+ __libdw_gnu_inline void update_section_size (const Elf_Data *newdata)
	181	{
	182	GElf_Shdr shdr_mem;
	183	GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
443ad427 JB	184	--- elfutils-0.128/src/unstrip.c.orig 2007-06-06 01:44:33.000000000 +0200
	185	+++ elfutils-0.128/src/unstrip.c 2007-06-12 18:51:03.570085226 +0200
	186	@@ -371,7 +371,7 @@
	187	{
	188	Elf_Data *data = elf_getdata (outscn, NULL);
	189
	190	- inline void adjust_reloc (GElf_Xword *info)
9b93296e	191	+ __libdw_gnu_inline void adjust_reloc (GElf_Xword *info)
443ad427 JB	192	{
	193	size_t ndx = GELF_R_SYM (*info);
	194	if (ndx != STN_UNDEF)
	195	@@ -988,7 +988,7 @@
	196	}
	197
	198	bool fail = false;
	199	- inline void check_match (bool match, Elf_Scn scn, const char name)
9b93296e	200	+ __libdw_gnu_inline void check_match (bool match, Elf_Scn scn, const char name)
443ad427 JB	201	{
	202	if (!match)
	203	{
	204	@@ -1147,7 +1147,7 @@
	205	}
	206
	207	/* Locate a matching unallocated section in SECTIONS. */
	208	- inline struct section find_unalloc_section (const GElf_Shdr shdr,
9b93296e	209	+ __libdw_gnu_inline struct section find_unalloc_section (const GElf_Shdr shdr,
443ad427 JB	210	const char *name)
	211	{
	212	size_t l = nalloc, u = stripped_shnum - 1;
	213	@@ -1983,7 +1983,7 @@
	214	handle_implicit_modules (const struct arg_info *info)
	215	{
	216	struct match_module_info mmi = { info->args, NULL, info->match_files };
	217	- inline ptrdiff_t next (ptrdiff_t offset)
9b93296e	218	+ __libdw_gnu_inline ptrdiff_t next (ptrdiff_t offset)
443ad427 JB	219	{
	220	return dwfl_getmodules (info->dwfl, &match_module, &mmi, offset);
	221	}