[patch] autotool dl_iterate_phdr instead of hardcoding glibc

17_all_gcc4-dl_iterate_phdr.patch (text/plain), 4.11 KB, created by Roy Marples (RETIRED) on 2007-09-13 11:12:33 UTC

FreeBSD-7 libc supports dl_iterate_phdr so we add a configure test
instead of relying on glibc defines.

Is there a better way of handling the ElfW define?

diff -ur a/gcc/config/ia64/fde-glibc.c b/gcc/config/ia64/fde-glibc.c
--- a/gcc/config/ia64/fde-glibc.c	2005-06-25 02:22:41 +0100
+++ b/gcc/config/ia64/fde-glibc.c	2007-09-10 15:19:14 +0100
@@ -37,8 +37,7 @@
 #include <link.h>
 #include "unwind-ia64.h"
 
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) \
-    || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && !defined(DT_CONFIG))
+#ifndef HAVE_DL_ITERATE_PHDR
 # error You need GLIBC 2.2.4 or later on IA-64 Linux
 #endif
 
diff -ur a/gcc/config.in b/gcc/config.in
--- a/gcc/config.in	2007-09-10 10:07:47 +0100
+++ b/gcc/config.in	2007-09-10 14:54:02 +0100
@@ -642,6 +642,12 @@
 #endif
 
 
+/* Define to 1 if you have the `dl_iterate_phdr' function. */
+#ifndef USED_FOR_TARGET
+#undef HAVE_DL_ITERATE_PHDR
+#endif
+
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #ifndef USED_FOR_TARGET
 #undef HAVE_FCNTL_H
diff -ur a/gcc/configure b/gcc/configure
--- a/gcc/configure	2007-09-10 10:07:43 +0100
+++ b/gcc/configure	2007-09-10 15:10:09 +0100
@@ -9287,15 +9875,16 @@
 
 
 
+
 for ac_func in times clock kill getrlimit setrlimit atoll atoq \
 	sysconf strsignal getrusage nl_langinfo scandir alphasort \
-	gettimeofday mbstowcs wcswidth mmap mincore setlocale \
+	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 eval "test \"\${$as_ac_var+set}\" = set"; then
+{ 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
diff -ur a/gcc/configure.ac b/gcc/configure.ac
--- a/gcc/configure.ac	2007-09-10 10:07:41 +0100
+++ b/gcc/configure.ac	2007-09-10 15:10:02 +0100
@@ -1050,7 +1050,7 @@
   putchar_unlocked putc_unlocked)
 AC_CHECK_FUNCS(times clock kill getrlimit setrlimit atoll atoq \
 	sysconf strsignal getrusage nl_langinfo scandir alphasort \
-	gettimeofday mbstowcs wcswidth mmap mincore setlocale \
+	gettimeofday mbstowcs wcswidth mmap mincore setlocale dl_iterate_phdr \
 	gcc_UNLOCKED_FUNCS)
 
 if test x$ac_cv_func_mbstowcs = xyes; then
diff -ur a/gcc/crtstuff.c b/gcc/crtstuff.c
--- a/gcc/crtstuff.c	2006-05-16 04:49:57 +0100
+++ b/gcc/crtstuff.c	2007-09-10 15:15:25 +0100
@@ -88,12 +88,9 @@
 
 #if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \
     && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
-    && defined(__GLIBC__) && __GLIBC__ >= 2
-#include <link.h>
-# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-#  define USE_PT_GNU_EH_FRAME
-# endif
+	&& defined(HAVE_DL_ITERATE_PHDR)
+# include <link.h>
+# define USE_PT_GNU_EH_FRAME
 #endif
 #if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
 # define USE_EH_FRAME_REGISTRY
diff -ur a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
--- a/gcc/unwind-dw2-fde-glibc.c	2005-12-15 16:17:50 +0000
+++ b/gcc/unwind-dw2-fde-glibc.c	2007-09-10 15:43:04 +0100
@@ -49,8 +49,7 @@
 #include "gthr.h"
 
 #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-    && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+	&& defined (HAVE_DL_ITERATE_PHDR)
 
 #ifndef __RELOC_POINTER
 # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
@@ -66,6 +65,13 @@
 #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;