Attachment #130797 for bug #192403

Lines 37-44 Link Here

(-)a/gcc/config/ia64/fde-glibc.c (-2 / +1 lines)
37	#include <link.h>	37	#include <link.h>
38	#include "unwind-ia64.h"	38	#include "unwind-ia64.h"
39		39
40	#if __GLIBC__ < 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) \	40	#ifndef HAVE_DL_ITERATE_PHDR
41	\|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && !defined(DT_CONFIG))
42	# error You need GLIBC 2.2.4 or later on IA-64 Linux	41	# error You need GLIBC 2.2.4 or later on IA-64 Linux
43	#endif	42	#endif
44		43

Lines 642-647 Link Here

(-)a/gcc/config.in (+6 lines)
642	#endif	642	#endif
643		643
644		644
		645	/* Define to 1 if you have the `dl_iterate_phdr' function. */
		646	#ifndef USED_FOR_TARGET
		647	#undef HAVE_DL_ITERATE_PHDR
		648	#endif
		649
		650
645	/* Define to 1 if you have the <fcntl.h> header file. */	651	/* Define to 1 if you have the <fcntl.h> header file. */
646	#ifndef USED_FOR_TARGET	652	#ifndef USED_FOR_TARGET
647	#undef HAVE_FCNTL_H	653	#undef HAVE_FCNTL_H








for ac_func in times clock kill getrlimit setrlimit atoll atoq \
	sysconf strsignal getrusage nl_langinfo scandir alphasort \
	gettimeofday mbstowcs wcswidth mmap mincore setlocale dl_iterate_phdr \
	clearerr_unlocked feof_unlocked   ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked   fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked   fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked   putchar_unlocked putc_unlocked
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  cat >conftest.$ac_ext <<_ACEOF

Lines 1050-1056 Link Here

(-)a/gcc/configure.ac (-1 / +1 lines)
1050	putchar_unlocked putc_unlocked)	1050	putchar_unlocked putc_unlocked)
1051	AC_CHECK_FUNCS(times clock kill getrlimit setrlimit atoll atoq \	1051	AC_CHECK_FUNCS(times clock kill getrlimit setrlimit atoll atoq \
1052	sysconf strsignal getrusage nl_langinfo scandir alphasort \	1052	sysconf strsignal getrusage nl_langinfo scandir alphasort \
1053	gettimeofday mbstowcs wcswidth mmap mincore setlocale \	1053	gettimeofday mbstowcs wcswidth mmap mincore setlocale dl_iterate_phdr \
1054	gcc_UNLOCKED_FUNCS)	1054	gcc_UNLOCKED_FUNCS)
1055		1055
1056	if test x$ac_cv_func_mbstowcs = xyes; then	1056	if test x$ac_cv_func_mbstowcs = xyes; then





#if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \
    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
	&& defined(HAVE_DL_ITERATE_PHDR)
# include <link.h>
# define USE_PT_GNU_EH_FRAME
     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
#  define USE_PT_GNU_EH_FRAME
# endif
#endif
#if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
# define USE_EH_FRAME_REGISTRY




#include "gthr.h"

#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
	&& defined (HAVE_DL_ITERATE_PHDR)
	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))

#ifndef __RELOC_POINTER
# define __RELOC_POINTER(ptr, base) ((ptr) + (base))

#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
#endif

/* Support FreeBSD */
#ifndef ElfW
# ifdef __ElfN
#  define ElfW __ElfN
# endif
#endif

struct unw_eh_callback_data
{
  _Unwind_Ptr pc;

Return to bug 192403

Lines 9287-9301 Link Here

(-)a/gcc/configure (-4 / +5 lines)
9287		9875
9288		9876
9289		9877
		9878
9290	for ac_func in times clock kill getrlimit setrlimit atoll atoq \	9879	for ac_func in times clock kill getrlimit setrlimit atoll atoq \
9291	sysconf strsignal getrusage nl_langinfo scandir alphasort \	9880	sysconf strsignal getrusage nl_langinfo scandir alphasort \
9292	gettimeofday mbstowcs wcswidth mmap mincore setlocale \	9881	gettimeofday mbstowcs wcswidth mmap mincore setlocale dl_iterate_phdr \
9293	clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked	9882	clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked
9294	do	9883	do
9295	as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh`	9884	as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh`
9296	echo "$as_me:$LINENO: checking for $ac_func" >&5	9885	{ echo "$as_me:$LINENO: checking for $ac_func" >&5
9297	echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6	9886	echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
9298	if eval "test \"\${$as_ac_var+set}\" = set"; then	9887	if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
9299	echo $ECHO_N "(cached) $ECHO_C" >&6	9888	echo $ECHO_N "(cached) $ECHO_C" >&6
9300	else	9889	else
9301	cat >conftest.$ac_ext <<_ACEOF	9890	cat >conftest.$ac_ext <<_ACEOF

Lines 88-99 Link Here

(-)a/gcc/crtstuff.c (-6 / +3 lines)
88		88
89	#if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \	89	#if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \
90	&& !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \	90	&& !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
91	&& defined(__GLIBC__) && __GLIBC__ >= 2	91	&& defined(HAVE_DL_ITERATE_PHDR)
92	#include <link.h>	92	# include <link.h>
93	# if (__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \	93	# define USE_PT_GNU_EH_FRAME
94	\|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
95	# define USE_PT_GNU_EH_FRAME
96	# endif
97	#endif	94	#endif
98	#if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)	95	#if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
99	# define USE_EH_FRAME_REGISTRY	96	# define USE_EH_FRAME_REGISTRY

Lines 49-56 Link Here

(-)a/gcc/unwind-dw2-fde-glibc.c (-2 / +8 lines)
49	#include "gthr.h"	49	#include "gthr.h"
50		50
51	#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \	51	#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
52	&& (__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \	52	&& defined (HAVE_DL_ITERATE_PHDR)
53	\|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
54		53
55	#ifndef __RELOC_POINTER	54	#ifndef __RELOC_POINTER
56	# define __RELOC_POINTER(ptr, base) ((ptr) + (base))	55	# define __RELOC_POINTER(ptr, base) ((ptr) + (base))
Lines 66-71 Link Here
66	#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)	65	#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
67	#endif	66	#endif
68		67
		68	/* Support FreeBSD */
		69	#ifndef ElfW
		70	# ifdef __ElfN
		71	# define ElfW __ElfN
		72	# endif
		73	#endif
		74
69	struct unw_eh_callback_data	75	struct unw_eh_callback_data
70	{	76	{
71	_Unwind_Ptr pc;	77	_Unwind_Ptr pc;