Attachment #736216 for bug #768444




GDWARF_5_FLAG=$ac_cv_gdwarf_5
AC_SUBST([GDWARF_5_FLAG])

AC_CACHE_CHECK([whether -gdwarf-5 produced DWARF5 .debug_line], ac_cv_dwarf_5_debugline, [dnl
save_CFLAGS="$CFLAGS"
CFLAGS="-gdwarf-5"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i=0;]],[[/* empty main */]])],
  [if $READELF --debug-dump=line conftest.o 2>&1 | \
   grep "DWARF Version:" 2>&1 | grep "5" > /dev/null 2>&1; \
     then ac_cv_dwarf_5_debugline=yes; \
     else ac_cv_dwarf_5_debugline=no; fi],
  ac_cv_dwarf_5_debugline=no)
CFLAGS="$save_CFLAGS"
])
DWARF_5_DEBUGLINE=$ac_cv_dwarf_5_debugline
AC_SUBST([DWARF_5_DEBUGLINE])

AC_CACHE_CHECK([whether gcc supports -gz=none], ac_cv_gz_none, [dnl
save_CFLAGS="$CFLAGS"
CFLAGS="-gz=none"

Lines 13-15 READELF="@READELF@" Link Here

(-)a/tests/atlocal.in (+1 lines)
13		13
14	GDWARF_5_FLAG=@GDWARF_5_FLAG@	14	GDWARF_5_FLAG=@GDWARF_5_FLAG@
15	GZ_NONE_FLAG=@GZ_NONE_FLAG@	15	GZ_NONE_FLAG=@GZ_NONE_FLAG@
		16	DWARF_5_DEBUGLINE=@DWARF_5_DEBUGLINE@




AT_SETUP([debugedit .debug_line objects DWARF5])
AT_KEYWORDS([debuginfo] [debugedit])
AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
DEBUGEDIT_SETUP([-gdwarf-5])

AT_DATA([expout],
[foo/bar/baz
foo/bar/baz/subdir_bar
foo/bar/baz/subdir_headers
])


AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./baz.o]])
AT_CHECK([[
$READELF --debug-dump=line foo.o subdir_bar/bar.o baz.o \
	| grep -A5 "The Directory Table" | grep "^  [0123]" \
	| cut -f2- -d/ | grep ^foo/ | sort -u
]],[0],[expout])

AT_CLEANUP

AT_SETUP([debugedit .debug_line partial DWARF5])
AT_KEYWORDS([debuginfo] [debugedit])
AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
DEBUGEDIT_SETUP([-gdwarf-5])

AT_DATA([expout],
[foo/bar/baz
foo/bar/baz/subdir_bar
foo/bar/baz/subdir_headers
])

AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o]])
AT_CHECK([[
$READELF --debug-dump=line ./foobarbaz.part.o \
	| grep -A5 "The Directory Table" | grep "^  [0123]" \
	| cut -f2- -d/ | grep ^foo/ | sort -u
]],[0],[expout])

AT_CLEANUP

AT_SETUP([debugedit .debug_line exe DWARF5])
AT_KEYWORDS([debuginfo] [debugedit])
AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
DEBUGEDIT_SETUP([-gdwarf-5])

AT_DATA([expout],
[foo/bar/baz
foo/bar/baz/subdir_bar
foo/bar/baz/subdir_headers
])

AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe]])
AT_CHECK([[
$READELF --debug-dump=line ./foobarbaz.exe \
	| grep -A5 "The Directory Table" | grep "^  [0123]" \
	| cut -f2- -d/ | grep ^foo/ | sort -u
]],[0],[expout])

AT_CLEANUP
- 

Return to bug 768444

Lines 87-92 CFLAGS="$save_CFLAGS" Link Here

(-)a/configure.ac (+14 lines)
87	GDWARF_5_FLAG=$ac_cv_gdwarf_5	87	GDWARF_5_FLAG=$ac_cv_gdwarf_5
88	AC_SUBST([GDWARF_5_FLAG])	88	AC_SUBST([GDWARF_5_FLAG])
89		89
		90	AC_CACHE_CHECK([whether -gdwarf-5 produced DWARF5 .debug_line], ac_cv_dwarf_5_debugline, [dnl
		91	save_CFLAGS="$CFLAGS"
		92	CFLAGS="-gdwarf-5"
		93	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i=0;]],[[/* empty main */]])],
		94	[if $READELF --debug-dump=line conftest.o 2>&1 \| \
		95	grep "DWARF Version:" 2>&1 \| grep "5" > /dev/null 2>&1; \
		96	then ac_cv_dwarf_5_debugline=yes; \
		97	else ac_cv_dwarf_5_debugline=no; fi],
		98	ac_cv_dwarf_5_debugline=no)
		99	CFLAGS="$save_CFLAGS"
		100	])
		101	DWARF_5_DEBUGLINE=$ac_cv_dwarf_5_debugline
		102	AC_SUBST([DWARF_5_DEBUGLINE])
		103
90	AC_CACHE_CHECK([whether gcc supports -gz=none], ac_cv_gz_none, [dnl	104	AC_CACHE_CHECK([whether gcc supports -gz=none], ac_cv_gz_none, [dnl
91	save_CFLAGS="$CFLAGS"	105	save_CFLAGS="$CFLAGS"
92	CFLAGS="-gz=none"	106	CFLAGS="-gz=none"

Lines 488-497 AT_CLEANUP Link Here

(-)a/tests/debugedit.at (-7 / +12 lines)
488	AT_SETUP([debugedit .debug_line objects DWARF5])	488	AT_SETUP([debugedit .debug_line objects DWARF5])
489	AT_KEYWORDS([debuginfo] [debugedit])	489	AT_KEYWORDS([debuginfo] [debugedit])
490	AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])	490	AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
		491	AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
491	DEBUGEDIT_SETUP([-gdwarf-5])	492	DEBUGEDIT_SETUP([-gdwarf-5])
492		493
493	AT_DATA([expout],	494	AT_DATA([expout],
494	[foo/bar/baz	495	[foo/bar/baz
		496	foo/bar/baz/subdir_bar
495	foo/bar/baz/subdir_headers	497	foo/bar/baz/subdir_headers
496	])	498	])
497		499
Lines 500-507 AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o]]) Link Here
500	AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./baz.o]])	502	AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./baz.o]])
501	AT_CHECK([[	503	AT_CHECK([[
502	$READELF --debug-dump=line foo.o subdir_bar/bar.o baz.o \	504	$READELF --debug-dump=line foo.o subdir_bar/bar.o baz.o \
503	\| grep -A5 "The Directory Table" \| grep "^ [123]" \	505	\| grep -A5 "The Directory Table" \| grep "^ [0123]" \
504	\| cut -f2- -d/ \| grep ^foo/ \| sort	506	\| cut -f2- -d/ \| grep ^foo/ \| sort -u
505	]],[0],[expout])	507	]],[0],[expout])
506		508
507	AT_CLEANUP	509	AT_CLEANUP
Lines 535-552 AT_CLEANUP Link Here
535	AT_SETUP([debugedit .debug_line partial DWARF5])	537	AT_SETUP([debugedit .debug_line partial DWARF5])
536	AT_KEYWORDS([debuginfo] [debugedit])	538	AT_KEYWORDS([debuginfo] [debugedit])
537	AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])	539	AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
		540	AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
538	DEBUGEDIT_SETUP([-gdwarf-5])	541	DEBUGEDIT_SETUP([-gdwarf-5])
539		542
540	AT_DATA([expout],	543	AT_DATA([expout],
541	[foo/bar/baz	544	[foo/bar/baz
		545	foo/bar/baz/subdir_bar
542	foo/bar/baz/subdir_headers	546	foo/bar/baz/subdir_headers
543	])	547	])
544		548
545	AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o]])	549	AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o]])
546	AT_CHECK([[	550	AT_CHECK([[
547	$READELF --debug-dump=line ./foobarbaz.part.o \	551	$READELF --debug-dump=line ./foobarbaz.part.o \
548	\| grep -A5 "The Directory Table" \| grep "^ [123]" \	552	\| grep -A5 "The Directory Table" \| grep "^ [0123]" \
549	\| cut -f2- -d/ \| grep ^foo/ \| sort	553	\| cut -f2- -d/ \| grep ^foo/ \| sort -u
550	]],[0],[expout])	554	]],[0],[expout])
551		555
552	AT_CLEANUP	556	AT_CLEANUP
Lines 580-597 AT_CLEANUP Link Here
580	AT_SETUP([debugedit .debug_line exe DWARF5])	584	AT_SETUP([debugedit .debug_line exe DWARF5])
581	AT_KEYWORDS([debuginfo] [debugedit])	585	AT_KEYWORDS([debuginfo] [debugedit])
582	AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])	586	AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
		587	AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
583	DEBUGEDIT_SETUP([-gdwarf-5])	588	DEBUGEDIT_SETUP([-gdwarf-5])
584		589
585	AT_DATA([expout],	590	AT_DATA([expout],
586	[foo/bar/baz	591	[foo/bar/baz
		592	foo/bar/baz/subdir_bar
587	foo/bar/baz/subdir_headers	593	foo/bar/baz/subdir_headers
588	])	594	])
589		595
590	AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe]])	596	AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe]])
591	AT_CHECK([[	597	AT_CHECK([[
592	$READELF --debug-dump=line ./foobarbaz.exe \	598	$READELF --debug-dump=line ./foobarbaz.exe \
593	\| grep -A5 "The Directory Table" \| grep "^ [123]" \	599	\| grep -A5 "The Directory Table" \| grep "^ [0123]" \
594	\| cut -f2- -d/ \| grep ^foo/ \| sort	600	\| cut -f2- -d/ \| grep ^foo/ \| sort -u
595	]],[0],[expout])	601	]],[0],[expout])
596		602
597	AT_CLEANUP	603	AT_CLEANUP
598	-