diff options
| -rw-r--r-- | ChangeLog.csl | 7 | ||||
| -rwxr-xr-x | gdb/configure | 103 | ||||
| -rw-r--r-- | gdb/configure.ac | 1 | ||||
| -rw-r--r-- | gdb/ser-tcp.c | 8 |
4 files changed, 7 insertions, 112 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 3bc6a8e..8c71032 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,10 @@ +2005-03-28 Mark Mitchell <mark@codesourcery.com> + + * gdb/ser-tcp.c (net_read_prim): Use recv unconditionally. + (net_write_prim): Use send unconditionally. + * gdb/configure.ac: Do not check for send and recv. + * gdb/configure: Regenerated. + 2005-03-28 Daniel Jacobowitz <dan@codesourcery.com> * gdb/remote-rdi.c (arm_rdi_insert_breakpoint): Don't call diff --git a/gdb/configure b/gdb/configure index e8e3700..b03bbc3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -15593,109 +15593,6 @@ fi done - -for ac_func in recv send -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 $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. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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_exeext' - { (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 - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - for ac_func in sbrk do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/gdb/configure.ac b/gdb/configure.ac index 7b2883f..12f2956 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -451,7 +451,6 @@ AC_CHECK_FUNCS(canonicalize_file_name realpath) AC_CHECK_FUNCS(getuid getgid) AC_CHECK_FUNCS(poll) AC_CHECK_FUNCS(pread64) -AC_CHECK_FUNCS(recv send) AC_CHECK_FUNCS(sbrk) AC_CHECK_FUNCS(setpgid setpgrp) AC_CHECK_FUNCS(sigaction sigprocmask sigsetmask) diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index e4e05af..f8b6d2e 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -237,21 +237,13 @@ net_close (struct serial *scb) static int net_read_prim (struct serial *scb, size_t count) { -#ifdef HAVE_RECV return recv (scb->fd, scb->buf, count, 0); -#else - return ser_unix_read_prim (scb, count); -#endif } static int net_write_prim (struct serial *scb, const char *str, int len) { -#ifdef HAVE_SEND return send (scb->fd, str, len, 0); -#else - return ser_unix_write_prim (scb, str, len); -#endif } void |