diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/config.in | 21 | ||||
| -rwxr-xr-x | gdb/configure | 162 | ||||
| -rw-r--r-- | gdb/configure.ac | 83 |
4 files changed, 5 insertions, 266 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d15bad7..323da72 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2013-11-08 Tom Tromey <tromey@redhat.com> + * configure, config.in: Rebuild. + * configure.ac: Remove all link.h-related checks. + +2013-11-08 Tom Tromey <tromey@redhat.com> + * acinclude.m4: Include common.m4. * common/common.m4: New file. * configure, config.in: Rebuild. diff --git a/gdb/config.in b/gdb/config.in index 03b0972..7905468 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -225,9 +225,6 @@ /* Define to 1 if you have the `w' library (-lw). */ #undef HAVE_LIBW -/* Define to 1 if you have the <link.h> header file. */ -#undef HAVE_LINK_H - /* Define to 1 if you have the <linux/perf_event.h> header file. */ #undef HAVE_LINUX_PERF_EVENT_H @@ -423,17 +420,6 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define if <sys/link.h> has struct link_map32 */ -#undef HAVE_STRUCT_LINK_MAP32 - -/* Define if <link.h> exists and defines struct link_map which has members - with an ``lm_'' prefix. (For SunOS.) */ -#undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS - -/* Define if <link.h> exists and defines struct link_map which has members - with an ``l_'' prefix. (For Solaris, SVR4, and SVR4-like systems.) */ -#undef HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS - /* Define to 1 if your system has struct lwp. */ #undef HAVE_STRUCT_LWP @@ -446,10 +432,6 @@ /* Define to 1 if `struct reg' is a member of `r_gs'. */ #undef HAVE_STRUCT_REG_R_GS -/* Define if <link.h> exists and defines a struct so_map which has members - with an ``som_'' prefix. (Found on older *BSD systems.) */ -#undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS - /* Define to 1 if `struct stat' is a member of `st_blksize'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE @@ -804,9 +786,6 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE -/* Define if <sys/link.h> has link_map32 (solaris sparc-64 target) */ -#undef _SYSCALL32 - /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/gdb/configure b/gdb/configure index 9d58b11..8844c90 100755 --- a/gdb/configure +++ b/gdb/configure @@ -8936,25 +8936,6 @@ fi done -for ac_header in link.h -do : - ac_fn_c_check_header_compile "$LINENO" "link.h" "ac_cv_header_link_h" "#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#if HAVE_NLIST_H -# include <nlist.h> -#endif - -" -if test "x$ac_cv_header_link_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LINK_H 1 -_ACEOF - -fi - -done - for ac_header in sys/proc.h do : ac_fn_c_check_header_compile "$LINENO" "sys/proc.h" "ac_cv_header_sys_proc_h" "#if HAVE_SYS_PARAM_H @@ -12016,149 +11997,6 @@ $as_echo "#define HAVE_PROCFS_PIOCSET 1" >>confdefs.h fi fi -if test ${host} = ${target} ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for member l_addr in struct link_map" >&5 -$as_echo_n "checking for member l_addr in struct link_map... " >&6; } - if test "${gdb_cv_have_struct_link_map_with_l_members+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <link.h> -int -main () -{ -struct link_map lm; (void) lm.l_addr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gdb_cv_have_struct_link_map_with_l_members=yes -else - gdb_cv_have_struct_link_map_with_l_members=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_struct_link_map_with_l_members" >&5 -$as_echo "$gdb_cv_have_struct_link_map_with_l_members" >&6; } - if test $gdb_cv_have_struct_link_map_with_l_members = yes; then - -$as_echo "#define HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for member lm_addr in struct link_map" >&5 -$as_echo_n "checking for member lm_addr in struct link_map... " >&6; } - if test "${gdb_cv_have_struct_link_map_with_lm_members+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <link.h> -int -main () -{ -struct link_map lm; (void) lm.lm_addr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gdb_cv_have_struct_link_map_with_lm_members=yes -else - gdb_cv_have_struct_link_map_with_lm_members=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_struct_link_map_with_lm_members" >&5 -$as_echo "$gdb_cv_have_struct_link_map_with_lm_members" >&6; } - if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then - -$as_echo "#define HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for member som_addr in struct so_map" >&5 -$as_echo_n "checking for member som_addr in struct so_map... " >&6; } - if test "${gdb_cv_have_struct_so_map_with_som_members+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#ifdef HAVE_NLIST_H -#include <nlist.h> -#endif -#include <link.h> -int -main () -{ -struct so_map lm; (void) lm.som_addr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gdb_cv_have_struct_so_map_with_som_members=yes -else - gdb_cv_have_struct_so_map_with_som_members=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_struct_so_map_with_som_members" >&5 -$as_echo "$gdb_cv_have_struct_so_map_with_som_members" >&6; } - if test $gdb_cv_have_struct_so_map_with_som_members = yes; then - -$as_echo "#define HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct link_map32 in sys/link.h" >&5 -$as_echo_n "checking for struct link_map32 in sys/link.h... " >&6; } - if test "${gdb_cv_have_struct_link_map32+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _SYSCALL32 -#include <sys/link.h> -int -main () -{ -struct link_map32 l; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gdb_cv_have_struct_link_map32=yes -else - gdb_cv_have_struct_link_map32=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_struct_link_map32" >&5 -$as_echo "$gdb_cv_have_struct_link_map32" >&6; } - if test $gdb_cv_have_struct_link_map32 = yes; then - -$as_echo "#define HAVE_STRUCT_LINK_MAP32 1" >>confdefs.h - - -$as_echo "#define _SYSCALL32 1" >>confdefs.h - - fi -fi - # Check if the compiler supports the `long long' type. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long support in compiler" >&5 diff --git a/gdb/configure.ac b/gdb/configure.ac index 3558d6a..8f9e1e2 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1084,14 +1084,6 @@ AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h sys/socket.h proc_serv sys/types.h sys/wait.h wait.h termios.h termio.h \ sgtty.h unistd.h elf_hp.h locale.h \ dlfcn.h sys/un.h linux/perf_event.h]) -AC_CHECK_HEADERS(link.h, [], [], -[#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#if HAVE_NLIST_H -# include <nlist.h> -#endif -]) AC_CHECK_HEADERS(sys/proc.h, [], [], [#if HAVE_SYS_PARAM_H # include <sys/param.h> @@ -1478,81 +1470,6 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then fi fi -dnl For native ports (host == target), check to see what kind of -dnl legacy link.h support is needed. (See solib-legacy.c.) -if test ${host} = ${target} ; then - dnl Check for struct link_map with l_ members which are indicative - dnl of SVR4-like shared libraries - - AC_MSG_CHECKING(for member l_addr in struct link_map) - AC_CACHE_VAL(gdb_cv_have_struct_link_map_with_l_members, - [AC_TRY_COMPILE([#include <link.h>], - [struct link_map lm; (void) lm.l_addr;], - gdb_cv_have_struct_link_map_with_l_members=yes, - gdb_cv_have_struct_link_map_with_l_members=no)]) - AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_l_members) - if test $gdb_cv_have_struct_link_map_with_l_members = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS,1, - [Define if <link.h> exists and defines struct link_map which has - members with an ``l_'' prefix. (For Solaris, SVR4, and - SVR4-like systems.)]) - fi - - dnl Check for struct link_map with lm_ members which are indicative - dnl of SunOS-like shared libraries - - AC_MSG_CHECKING(for member lm_addr in struct link_map) - AC_CACHE_VAL(gdb_cv_have_struct_link_map_with_lm_members, - [AC_TRY_COMPILE([#include <sys/types.h> -#include <link.h>], - [struct link_map lm; (void) lm.lm_addr;], - gdb_cv_have_struct_link_map_with_lm_members=yes, - gdb_cv_have_struct_link_map_with_lm_members=no)]) - AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_lm_members) - if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS, 1, - [Define if <link.h> exists and defines struct link_map which has - members with an ``lm_'' prefix. (For SunOS.)]) - fi - - dnl Check for struct so_map with som_ members which are found on - dnl some *BSD systems. - - AC_MSG_CHECKING(for member som_addr in struct so_map) - AC_CACHE_VAL(gdb_cv_have_struct_so_map_with_som_members, - [AC_TRY_COMPILE([#include <sys/types.h> -#ifdef HAVE_NLIST_H -#include <nlist.h> -#endif -#include <link.h>], - [struct so_map lm; (void) lm.som_addr;], - gdb_cv_have_struct_so_map_with_som_members=yes, - gdb_cv_have_struct_so_map_with_som_members=no)]) - AC_MSG_RESULT($gdb_cv_have_struct_so_map_with_som_members) - if test $gdb_cv_have_struct_so_map_with_som_members = yes; then - AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS, 1, - [Define if <link.h> exists and defines a struct so_map which has - members with an ``som_'' prefix. (Found on older *BSD systems.)]) - fi - - dnl Check for struct link_map32 type, which allows a 64-bit Solaris - dnl debugger to debug a 32-bit Solaris app with 32-bit shared libraries. - - AC_MSG_CHECKING(for struct link_map32 in sys/link.h) - AC_CACHE_VAL(gdb_cv_have_struct_link_map32, - [AC_TRY_COMPILE([#define _SYSCALL32 -#include <sys/link.h>], [struct link_map32 l;], - gdb_cv_have_struct_link_map32=yes, - gdb_cv_have_struct_link_map32=no)]) - AC_MSG_RESULT($gdb_cv_have_struct_link_map32) - if test $gdb_cv_have_struct_link_map32 = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP32, 1, - [Define if <sys/link.h> has struct link_map32]) - AC_DEFINE(_SYSCALL32, 1, - [Define if <sys/link.h> has link_map32 (solaris sparc-64 target)]) - fi -fi - # Check if the compiler supports the `long long' type. AC_CACHE_CHECK([for long long support in compiler], gdb_cv_c_long_long, |