Attachment #158341 for bug #229269

View | Details | Raw Unified | Return to bug 229269
Collapse All | Expand All

Lines 56-64 Link Here

(-)elfutils-0.127.orig/libdw/dwarf_whatattr.c (+4 lines)
56	#include "libdwP.h"	56	#include "libdwP.h"
57		57
58		58
		59	#ifdef __OPTIMIZE__
		60	extern inline unsigned int dwarf_whatattr (Dwarf_Attribute *attr);
		61	#else /* Optimize. */
59	unsigned int	62	unsigned int
60	dwarf_whatattr (attr)	63	dwarf_whatattr (attr)
61	Dwarf_Attribute *attr;	64	Dwarf_Attribute *attr;
62	{	65	{
63	return attr == NULL ? 0 : attr->code;	66	return attr == NULL ? 0 : attr->code;
64	}	67	}
		68	#endif /* Optimize. */

Lines 56-64 Link Here

(-)elfutils-0.127.orig/libdw/dwarf_whatform.c (+4 lines)
56	#include "libdwP.h"	56	#include "libdwP.h"
57		57
58		58
		59	#ifdef __OPTIMIZE__
		60	extern inline unsigned int dwarf_whatform (Dwarf_Attribute *attr);
		61	#else /* Optimize. */
59	unsigned int	62	unsigned int
60	dwarf_whatform (attr)	63	dwarf_whatform (attr)
61	Dwarf_Attribute *attr;	64	Dwarf_Attribute *attr;
62	{	65	{
63	return attr == NULL ? 0 : attr->form;	66	return attr == NULL ? 0 : attr->form;
64	}	67	}
		68	#endif /* Optimize. */




/* Check whether given attribute has specific form.  */
extern int dwarf_hasform (Dwarf_Attribute *attr, unsigned int search_form);

#ifndef __OPTIMIZE__
/* Return attribute code of given attribute.  */
extern unsigned int dwarf_whatattr (Dwarf_Attribute *attr);

/* Return form code of given attribute.  */
extern unsigned int dwarf_whatform (Dwarf_Attribute *attr);
#endif	/* !Optimize.  */


/* Return string associated with given attribute.  */

/* Inline optimizations.  */
#ifdef __OPTIMIZE__
/* Return attribute code of given attribute.  */
inline unsigned int
dwarf_whatattr (Dwarf_Attribute *attr)
{
  return attr == NULL ? 0 : attr->code;
}

/* Return form code of given attribute.  */
inline unsigned int
dwarf_whatform (Dwarf_Attribute *attr)
{
  return attr == NULL ? 0 : attr->form;




/* Helper functions for the architecture specific code.  */

/* Checked whether the symbol is undefined and referenced from a DSO.  */
#ifndef __OPTIMIZE__
extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
#else	/* !Optimize.  */
inline bool
linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
{
  struct usedfiles *file = scninfo->fileinfo;


  return sym->defined && sym->in_dso;
}
#endif	/* !Optimize.  */

#endif	/* ld.h */

Lines 159-164 Link Here

(-)elfutils-0.127.orig/src/ldgeneric.c (+4 lines)
159	}	159	}
160		160
161		161
		162	#ifdef __OPTIMIZE__
		163	extern inline bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
		164	#else /* Optimize. */
162	bool	165	bool
163	linked_from_dso_p (struct scninfo *scninfo, size_t symidx)	166	linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
164	{	167	{
Lines 173-178 Link Here
173		176
174	return sym->defined && sym->in_dso;	177	return sym->defined && sym->in_dso;
175	}	178	}
		179	#endif /* Optimize. */
176		180
177		181
178	/* Initialize state object. This callback function is called after the	182	/* Initialize state object. This callback function is called after the

Return to bug 229269

Lines 282-292 Link Here

(-)elfutils-0.127.orig/libdw/libdw.h (-3 / +5 lines)
282	/* Check whether given attribute has specific form. */	282	/* Check whether given attribute has specific form. */
283	extern int dwarf_hasform (Dwarf_Attribute *attr, unsigned int search_form);	283	extern int dwarf_hasform (Dwarf_Attribute *attr, unsigned int search_form);
284		284
		285	#ifndef __OPTIMIZE__
285	/* Return attribute code of given attribute. */	286	/* Return attribute code of given attribute. */
286	extern unsigned int dwarf_whatattr (Dwarf_Attribute *attr);	287	extern unsigned int dwarf_whatattr (Dwarf_Attribute *attr);
287		288
288	/* Return form code of given attribute. */	289	/* Return form code of given attribute. */
289	extern unsigned int dwarf_whatform (Dwarf_Attribute *attr);	290	extern unsigned int dwarf_whatform (Dwarf_Attribute *attr);
		291	#endif /* !Optimize. */
290		292
291		293
292	/* Return string associated with given attribute. */	294	/* Return string associated with given attribute. */
Lines 624-637 Link Here
624	/* Inline optimizations. */	626	/* Inline optimizations. */
625	#ifdef __OPTIMIZE__	627	#ifdef __OPTIMIZE__
626	/* Return attribute code of given attribute. */	628	/* Return attribute code of given attribute. */
627	extern inline unsigned int	629	inline unsigned int
628	dwarf_whatattr (Dwarf_Attribute *attr)	630	dwarf_whatattr (Dwarf_Attribute *attr)
629	{	631	{
630	return attr == NULL ? 0 : attr->code;	632	return attr == NULL ? 0 : attr->code;
631	}	633	}
632		634
633	/* Return attribute code of given attribute. */	635	/* Return form code of given attribute. */
634	extern inline unsigned int	636	inline unsigned int
635	dwarf_whatform (Dwarf_Attribute *attr)	637	dwarf_whatform (Dwarf_Attribute *attr)
636	{	638	{
637	return attr == NULL ? 0 : attr->form;	639	return attr == NULL ? 0 : attr->form;

Lines 1086-1093 Link Here

(-)elfutils-0.127.orig/src/ld.h (-1 / +4 lines)
1086	/* Helper functions for the architecture specific code. */	1086	/* Helper functions for the architecture specific code. */
1087		1087
1088	/* Checked whether the symbol is undefined and referenced from a DSO. */	1088	/* Checked whether the symbol is undefined and referenced from a DSO. */
		1089	#ifndef __OPTIMIZE__
1089	extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);	1090	extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
1090	extern inline bool	1091	#else /* !Optimize. */
		1092	inline bool
1091	linked_from_dso_p (struct scninfo *scninfo, size_t symidx)	1093	linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
1092	{	1094	{
1093	struct usedfiles *file = scninfo->fileinfo;	1095	struct usedfiles *file = scninfo->fileinfo;
Lines 1101-1105 Link Here
1101		1103
1102	return sym->defined && sym->in_dso;	1104	return sym->defined && sym->in_dso;
1103	}	1105	}
		1106	#endif /* !Optimize. */
1104		1107
1105	#endif /* ld.h */	1108	#endif /* ld.h */