Attachment #350482 for bug #470884

Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Gentoo's Bugzilla – Attachment #350482: Check if mtrace() is available and disable it if it is not. for bug #470884

View | Details | Raw Unified | Return to bug 470884 | Differences between

and this patch

Collapse All | Expand All

Lines 233-238 AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl Link Here

(-)a/configure.ac (+3 lines)
233	AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])	233	AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
234	AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)	234	AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)
235		235
		236	dnl Check for mtrace support
		237	AC_CHECK_HEADER([mcheck.h])
		238
236	dnl Check if we have argp available from our libc	239	dnl Check if we have argp available from our libc
237	AC_LINK_IFELSE(	240	AC_LINK_IFELSE(
238	[AC_LANG_PROGRAM(	241	[AC_LANG_PROGRAM(

Lines 30-36 Link Here

(-)a/src/addr2line.c (+4 lines)
30	#include <dwarf.h>	30	#include <dwarf.h>
31	#include <libintl.h>	31	#include <libintl.h>
32	#include <locale.h>	32	#include <locale.h>
		33	#ifdef HAVE_MCHECK_H
33	#include <mcheck.h>	34	#include <mcheck.h>
		35	#else
		36	#define mtrace()
		37	#endif
34	#include <stdbool.h>	38	#include <stdbool.h>
35	#include <stdio.h>	39	#include <stdio.h>
36	#include <stdio_ext.h>	40	#include <stdio_ext.h>

Lines 28-34 Link Here

(-)a/src/ar.c (+4 lines)
28	#include <libintl.h>	28	#include <libintl.h>
29	#include <limits.h>	29	#include <limits.h>
30	#include <locale.h>	30	#include <locale.h>
		31	#ifdef HAVE_MCHECK_H
31	#include <mcheck.h>	32	#include <mcheck.h>
		33	#else
		34	#define mtrace()
		35	#endif
32	#include <search.h>	36	#include <search.h>
33	#include <stdbool.h>	37	#include <stdbool.h>
34	#include <stdlib.h>	38	#include <stdlib.h>

Lines 26-32 Link Here

(-)a/src/ld.c (+4 lines)
26	#include <libelf.h>	26	#include <libelf.h>
27	#include <libintl.h>	27	#include <libintl.h>
28	#include <locale.h>	28	#include <locale.h>
		29	#ifdef HAVE_MCHECK_H
29	#include <mcheck.h>	30	#include <mcheck.h>
		31	#else
		32	#define mtrace()
		33	#endif
30	#include <stdio.h>	34	#include <stdio.h>
31	#include <stdio_ext.h>	35	#include <stdio_ext.h>
32	#include <stdlib.h>	36	#include <stdlib.h>

Lines 33-39 Link Here

(-)a/src/nm.c (+4 lines)
33	#include <libdw.h>	33	#include <libdw.h>
34	#include <libintl.h>	34	#include <libintl.h>
35	#include <locale.h>	35	#include <locale.h>
		36	#ifdef HAVE_MCHECK_H
36	#include <mcheck.h>	37	#include <mcheck.h>
		38	#else
		39	#define mtrace()
		40	#endif
37	#include <obstack.h>	41	#include <obstack.h>
38	#include <search.h>	42	#include <search.h>
39	#include <stdbool.h>	43	#include <stdbool.h>

Lines 26-32 Link Here

(-)a/src/objdump.c (+4 lines)
26	#include <inttypes.h>	26	#include <inttypes.h>
27	#include <libintl.h>	27	#include <libintl.h>
28	#include <locale.h>	28	#include <locale.h>
		29	#ifdef HAVE_MCHECK_H
29	#include <mcheck.h>	30	#include <mcheck.h>
		31	#else
		32	#define mtrace()
		33	#endif
30	#include <stdbool.h>	34	#include <stdbool.h>
31	#include <stdio.h>	35	#include <stdio.h>
32	#include <stdio_ext.h>	36	#include <stdio_ext.h>

Lines 29-35 Link Here

(-)a/src/ranlib.c (+4 lines)
29	#include <gelf.h>	29	#include <gelf.h>
30	#include <libintl.h>	30	#include <libintl.h>
31	#include <locale.h>	31	#include <locale.h>
		32	#ifdef HAVE_MCHECK_H
32	#include <mcheck.h>	33	#include <mcheck.h>
		34	#else
		35	#define mtrace()
		36	#endif
33	#include <obstack.h>	37	#include <obstack.h>
34	#include <stdlib.h>	38	#include <stdlib.h>
35	#include <stdio.h>	39	#include <stdio.h>

Lines 28-34 Link Here

(-)a/src/size.c (+4 lines)
28	#include <libelf.h>	28	#include <libelf.h>
29	#include <libintl.h>	29	#include <libintl.h>
30	#include <locale.h>	30	#include <locale.h>
		31	#ifdef HAVE_MCHECK_H
31	#include <mcheck.h>	32	#include <mcheck.h>
		33	#else
		34	#define mtrace()
		35	#endif
32	#include <stdbool.h>	36	#include <stdbool.h>
33	#include <stdio.h>	37	#include <stdio.h>
34	#include <stdio_ext.h>	38	#include <stdio_ext.h>

Lines 30-36 Link Here

(-)a/src/strip.c (+4 lines)
30	#include <libelf.h>	30	#include <libelf.h>
31	#include <libintl.h>	31	#include <libintl.h>
32	#include <locale.h>	32	#include <locale.h>
		33	#ifdef HAVE_MCHECK_H
33	#include <mcheck.h>	34	#include <mcheck.h>
		35	#else
		36	#define mtrace()
		37	#endif
34	#include <stdbool.h>	38	#include <stdbool.h>
35	#include <stdio.h>	39	#include <stdio.h>
36	#include <stdio_ext.h>	40	#include <stdio_ext.h>

Lines 36-42 Link Here

(-)a/src/unstrip.c (-1 / +4 lines)
36	#include <fnmatch.h>	36	#include <fnmatch.h>
37	#include <libintl.h>	37	#include <libintl.h>
38	#include <locale.h>	38	#include <locale.h>
		39	#ifdef HAVE_MCHECK_H
39	#include <mcheck.h>	40	#include <mcheck.h>
		41	#else
		42	#define mtrace()
		43	#endif
40	#include <stdbool.h>	44	#include <stdbool.h>
41	#include <stdio.h>	45	#include <stdio.h>
42	#include <stdio_ext.h>	46	#include <stdio_ext.h>
43	-

Return to bug 470884