From d32a47a28c3f6635b445af2b6411dcdf5162ba5b Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 13 Jun 2005 21:59:38 +0000 Subject: [PATCH] * configure.ac: Use AC_CHECK_TYPES to check for uintptr_t. * configure, config.in: Regenerate. --- gdb/ChangeLog | 3 ++ gdb/config.in | 2 +- gdb/configure | 129 ++++++++++++++++++++++++++++--------------------------- gdb/configure.ac | 13 +----- 4 files changed, 71 insertions(+), 76 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 257dec26ef..5074c9260a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2005-06-13 Mark Kettenis + * configure.ac: Use AC_CHECK_TYPES to check for uintptr_t. + * configure, config.in: Regenerate. + * ser-tcp.c: Tewak comment. [!HAVE_SOCKLEN_T]: Typedef socklen_t. * configure.ac: Add check for socklen_t. diff --git a/gdb/config.in b/gdb/config.in index 2e91e990e3..eb48a1a4f0 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -566,7 +566,7 @@ /* Define to 1 if you have the `ttrace' function. */ #undef HAVE_TTRACE -/* Define if provides the uintptr_t type. */ +/* Define to 1 if the system has the type `uintptr_t'. */ #undef HAVE_UINTPTR_T /* Define to 1 if you have the header file. */ diff --git a/gdb/configure b/gdb/configure index be710deefb..f3b2da0a35 100755 --- a/gdb/configure +++ b/gdb/configure @@ -13864,6 +13864,72 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for uintptr_t" >&5 +echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6 +if test "${ac_cv_type_uintptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if ((uintptr_t *) 0) + return 0; +if (sizeof (uintptr_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_uintptr_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_uintptr_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 +echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6 +if test $ac_cv_type_uintptr_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_UINTPTR_T 1 +_ACEOF + + +fi + # ------------------------------------- # # Checks for compiler characteristics. # @@ -17804,69 +17870,6 @@ _ACEOF fi -# See if stdint.h provides the uintptr_t type. -# Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this. -echo "$as_me:$LINENO: checking for uintptr_t in stdint.h" >&5 -echo $ECHO_N "checking for uintptr_t in stdint.h... $ECHO_C" >&6 -if test "${gdb_cv_have_uintptr_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -uintptr_t foo = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gdb_cv_have_uintptr_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -gdb_cv_have_uintptr_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $gdb_cv_have_uintptr_t" >&5 -echo "${ECHO_T}$gdb_cv_have_uintptr_t" >&6 -if test $gdb_cv_have_uintptr_t = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_UINTPTR_T 1 -_ACEOF - -fi - # If we are configured native on GNU/Linux, work around problems with # sys/procfs.h # Also detect which type of /proc is in use, such as for Unixware or Solaris. diff --git a/gdb/configure.ac b/gdb/configure.ac index 0032d41e9c..e77fc9ec57 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -436,6 +436,7 @@ AC_CHECK_TYPES(socklen_t, [], [], [#include #include ]) +AC_CHECK_TYPES(uintptr_t, [], [], [#include ]) # ------------------------------------- # # Checks for compiler characteristics. # @@ -668,18 +669,6 @@ if test $gdb_cv_have_pt_getxmmregs = yes; then AC_DEFINE(HAVE_PT_GETXMMREGS) fi -# See if stdint.h provides the uintptr_t type. -# Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this. -AC_CACHE_CHECK([for uintptr_t in stdint.h], gdb_cv_have_uintptr_t, - [AC_TRY_COMPILE( - [#include ], - [uintptr_t foo = 0;], - gdb_cv_have_uintptr_t=yes, - gdb_cv_have_uintptr_t=no)]) -if test $gdb_cv_have_uintptr_t = yes; then - AC_DEFINE(HAVE_UINTPTR_T, 1, [Define if provides the uintptr_t type.]) -fi - # If we are configured native on GNU/Linux, work around problems with # sys/procfs.h # Also detect which type of /proc is in use, such as for Unixware or Solaris. -- 2.11.0