summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2014-11-04 22:17:02 +0800
committerYao Qi <yao@codesourcery.com>2014-11-28 18:37:52 +0800
commitbdca27a2f57f5152ec83766d7a8b25b2d33b8905 (patch)
treeef9071bec4fb43dbce216e92fee033b7754e7dda
parent2196f55f0140f3e278ed4002040f32acc5a6aaf1 (diff)
downloadbinutils-gdb-bdca27a2f57f5152ec83766d7a8b25b2d33b8905.tar.gz
Use readlink unconditionally
Since readlink module is imported, we can use it unconditionally. This patch is to remove configure checks and HAVE_READLINK checks in code. It was mentioned in the patch below [RFA/commit] gdbserver: return ENOSYS if readlink not supported. https://sourceware.org/ml/gdb-patches/2012-02/msg00148.html to use readlink in gdbserver, but we chose something simple at that moment. gdb: 2014-11-28 Yao Qi <yao@codesourcery.com> * configure.ac (AC_CHECK_FUNCS): Remove readlink. * config.in, configure: Re-generate. * inf-child.c (inf_child_fileio_readlink): Don't check HAVE_READLINK is defined. gdb/gdbserver: 2014-11-28 Yao Qi <yao@codesourcery.com> * configure.ac(AC_CHECK_FUNCS): Remove readlink. * config.in, configure: Re-generate. * hostio.c (handle_unlink): Remove code checking HAVE_READLINK is defined.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/config.in3
-rwxr-xr-xgdb/configure2
-rw-r--r--gdb/configure.ac2
-rw-r--r--gdb/gdbserver/ChangeLog7
-rw-r--r--gdb/gdbserver/config.in3
-rwxr-xr-xgdb/gdbserver/configure2
-rw-r--r--gdb/gdbserver/configure.ac2
-rw-r--r--gdb/gdbserver/hostio.c4
-rw-r--r--gdb/inf-child.c2
10 files changed, 19 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 66711f66d00..075abc56460 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2014-11-28 Yao Qi <yao@codesourcery.com>
+ * configure.ac (AC_CHECK_FUNCS): Remove readlink.
+ * config.in, configure: Re-generate.
+ * inf-child.c (inf_child_fileio_readlink): Don't check
+ HAVE_READLINK is defined.
+
+2014-11-28 Yao Qi <yao@codesourcery.com>
+
* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add readlink.
* gnulib/aclocal.m4: Re-generated.
* gnulib/config.in: Likewise.
diff --git a/gdb/config.in b/gdb/config.in
index f1593bd6560..80b988b05a9 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -330,9 +330,6 @@
/* Define if Python interpreter is being linked in. */
#undef HAVE_PYTHON
-/* Define to 1 if you have the `readlink' function. */
-#undef HAVE_READLINK
-
/* Define to 1 if you have the `realpath' function. */
#undef HAVE_REALPATH
diff --git a/gdb/configure b/gdb/configure
index ade17550300..e1c0a108dfc 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10479,7 +10479,7 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
fi
for ac_func in canonicalize_file_name realpath getrusage getuid getgid \
- pipe poll pread pread64 pwrite readlink resize_term \
+ pipe poll pread pread64 pwrite resize_term \
sbrk setpgid setpgrp setsid \
sigaction sigprocmask sigsetmask socketpair \
ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 98eb57b5b53..bcf1ef2ea9b 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1305,7 +1305,7 @@ AC_C_BIGENDIAN
AC_FUNC_MMAP
AC_FUNC_VFORK
AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid getgid \
- pipe poll pread pread64 pwrite readlink resize_term \
+ pipe poll pread pread64 pwrite resize_term \
sbrk setpgid setpgrp setsid \
sigaction sigprocmask sigsetmask socketpair \
ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 141947089ff..e378a5f5b86 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-28 Yao Qi <yao@codesourcery.com>
+
+ * configure.ac(AC_CHECK_FUNCS): Remove readlink.
+ * config.in, configure: Re-generate.
+ * hostio.c (handle_unlink): Remove code checking HAVE_READLINK
+ is defined.
+
2014-11-21 Yao Qi <yao@codesourcery.com>
* configure.ac: Don't invoke AC_FUNC_ALLOCA.
diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
index 8cac20538ef..fd80adc9542 100644
--- a/gdb/gdbserver/config.in
+++ b/gdb/gdbserver/config.in
@@ -142,9 +142,6 @@
/* Define to 1 if you have the `pwrite' function. */
#undef HAVE_PWRITE
-/* Define to 1 if you have the `readlink' function. */
-#undef HAVE_READLINK
-
/* Define to 1 if you have the <sgtty.h> header file. */
#undef HAVE_SGTTY_H
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 22666178a01..45838f53856 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -4727,7 +4727,7 @@ fi
done
-for ac_func in pread pwrite pread64 readlink
+for ac_func in pread pwrite pread64
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 3864ff469df..f59e65b579f 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -83,7 +83,7 @@ AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl
fcntl.h signal.h sys/file.h dnl
sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl
netinet/tcp.h arpa/inet.h)
-AC_CHECK_FUNCS(pread pwrite pread64 readlink)
+AC_CHECK_FUNCS(pread pwrite pread64)
GDB_AC_COMMON
diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c
index 1d7a0922e3c..8435ecb9f09 100644
--- a/gdb/gdbserver/hostio.c
+++ b/gdb/gdbserver/hostio.c
@@ -478,7 +478,6 @@ handle_unlink (char *own_buf)
static void
handle_readlink (char *own_buf, int *new_packet_len)
{
-#if defined (HAVE_READLINK)
char filename[HOSTIO_PATH_MAX], linkname[HOSTIO_PATH_MAX];
char *p;
int ret, bytes_sent;
@@ -505,9 +504,6 @@ handle_readlink (char *own_buf, int *new_packet_len)
to return a partial response, but simply fail. */
if (bytes_sent < ret)
sprintf (own_buf, "F-1,%x", FILEIO_ENAMETOOLONG);
-#else /* ! HAVE_READLINK */
- sprintf (own_buf, "F-1,%x", FILEIO_ENOSYS);
-#endif
}
/* Handle all the 'F' file transfer packets. */
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index 9867ee6651a..3166c4d4e7e 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -412,7 +412,7 @@ inf_child_fileio_readlink (struct target_ops *self,
{
/* We support readlink only on systems that also provide a compile-time
maximum path length (PATH_MAX), at least for now. */
-#if defined (HAVE_READLINK) && defined (PATH_MAX)
+#if defined (PATH_MAX)
char buf[PATH_MAX];
int len;
char *ret;