From 8bdce1ffdf65dc18332dfddb39482f6685cec85a Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 15 Nov 2012 16:12:19 +0000 Subject: [PATCH] 2012-11-15 Pierre Muller ARI fixes: move gdb_wait and gdb_stat headers to common subdirectory. * gdb_stat.h: Delete. Moved to common directory. * common/gdb_stat.h: New file. * gdb_wait.h: Delete. Moved to common directory. * common/gdb_wait.h: New file. * Makefile.in (H_FILES_NO_SRC): Adapt to new header location. * contrib/ari/gdb_ari.sh (wait.h rule): Adapt to new gdb_wait.h location. (stat.h rule): Adapt to new gdb_stat.h location. * common/linux-osdata.c: Include "gdb_stat.h" header instead of header. * common/linux-ptrace.c: Include "gdb_wait.h" header instead of header. gdbserver ChangeLog entry: 2012-11-15 Pierre Muller * configure.ac (AC_CHECK_HEADERS): Add wait.h header. * config.in: Regenerate. * configure: Regenerate. * linux-low.c: Use "gdb_stat.h" header instead of header. Use "gdb_wait.h" header instead of header. * lynx-low.c: Use "gdb_wait.h" header instead of header. * remote-utils.c: Use "gdb_stat.h" header instead of header. * server.c: Remove HAVE_WAIT_H conditional. Use "gdb_wait.h" header instead of header. * spu-low.c: Use "gdb_wait.h" header instead of header. --- gdb/ChangeLog | 17 +++++++++++++++++ gdb/Makefile.in | 4 ++-- gdb/{ => common}/gdb_stat.h | 0 gdb/{ => common}/gdb_wait.h | 0 gdb/common/linux-osdata.c | 2 +- gdb/common/linux-ptrace.c | 2 +- gdb/contrib/ari/gdb_ari.sh | 4 ++-- gdb/gdbserver/ChangeLog | 14 ++++++++++++++ gdb/gdbserver/config.in | 3 +++ gdb/gdbserver/configure | 2 +- gdb/gdbserver/configure.ac | 2 +- gdb/gdbserver/linux-low.c | 4 ++-- gdb/gdbserver/lynx-low.c | 2 +- gdb/gdbserver/remote-utils.c | 2 +- gdb/gdbserver/server.c | 4 +--- gdb/gdbserver/spu-low.c | 2 +- 16 files changed, 48 insertions(+), 16 deletions(-) rename gdb/{ => common}/gdb_stat.h (100%) rename gdb/{ => common}/gdb_wait.h (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 19528614a23..1aeafec34ec 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2012-11-15 Pierre Muller + + ARI fixes: move gdb_wait and gdb_stat headers to common subdirectory. + * gdb_stat.h: Delete. Moved to common directory. + * common/gdb_stat.h: New file. + * gdb_wait.h: Delete. Moved to common directory. + * common/gdb_wait.h: New file. + * Makefile.in (H_FILES_NO_SRC): Adapt to new header + location. + * contrib/ari/gdb_ari.sh (wait.h rule): Adapt to new gdb_wait.h + location. + (stat.h rule): Adapt to new gdb_stat.h location. + * common/linux-osdata.c: Include "gdb_stat.h" header instead of + header. + * common/linux-ptrace.c: Include "gdb_wait.h" header instead of + header. + 2012-11-15 Pierre Muller * configure.ac (AC_HEADER_STAT): Remove. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9e7702d6750..e9aeb0caa37 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -781,7 +781,7 @@ gnulib/import/string.in.h gnulib/import/str-two-way.h \ gnulib/import/stdint.in.h remote.h gdb.h sparc-nat.h \ gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \ amd64-nat.h s390-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \ -gdbarch.h bsd-uthread.h gdb_stat.h memory-map.h memrange.h \ +gdbarch.h bsd-uthread.h common/gdb_stat.h memory-map.h memrange.h \ mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \ ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \ f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \ @@ -799,7 +799,7 @@ expression.h score-tdep.h gdb_select.h ser-tcp.h buildsym.h valprint.h \ call-cmds.h typeprint.h mi/mi-getopt.h mi/mi-parse.h mi/mi-console.h \ mi/mi-out.h mi/mi-main.h mi/mi-common.h mi/mi-cmds.h linux-nat.h \ complaints.h gdb_proc_service.h gdb_regex.h xtensa-tdep.h inf-loop.h \ -gdb_wait.h common/gdb_assert.h solib.h ppc-tdep.h cp-support.h glibc-tdep.h \ +common/gdb_wait.h common/gdb_assert.h solib.h ppc-tdep.h cp-support.h glibc-tdep.h \ interps.h auxv.h gdbcmd.h tramp-frame.h mipsnbsd-tdep.h \ amd64-linux-tdep.h linespec.h i387-tdep.h mn10300-tdep.h \ sparc64-tdep.h monitor.h ppcobsd-tdep.h srec.h solib-pa64.h \ diff --git a/gdb/gdb_stat.h b/gdb/common/gdb_stat.h similarity index 100% rename from gdb/gdb_stat.h rename to gdb/common/gdb_stat.h diff --git a/gdb/gdb_wait.h b/gdb/common/gdb_wait.h similarity index 100% rename from gdb/gdb_wait.h rename to gdb/common/gdb_wait.h diff --git a/gdb/common/linux-osdata.c b/gdb/common/linux-osdata.c index 0b1c5acaa9d..afe3e752f77 100644 --- a/gdb/common/linux-osdata.c +++ b/gdb/common/linux-osdata.c @@ -26,7 +26,6 @@ #include "linux-osdata.h" #include -#include #include #include #include @@ -43,6 +42,7 @@ #include "buffer.h" #include "gdb_assert.h" #include "gdb_dirent.h" +#include "gdb_stat.h" /* Define PID_T to be a fixed size that is at least as large as pid_t, so that reading pid values embedded in /proc works diff --git a/gdb/common/linux-ptrace.c b/gdb/common/linux-ptrace.c index ae17786eb7a..55ba766c94a 100644 --- a/gdb/common/linux-ptrace.c +++ b/gdb/common/linux-ptrace.c @@ -27,6 +27,7 @@ #include "linux-procfs.h" #include "buffer.h" #include "gdb_assert.h" +#include "gdb_wait.h" /* Find all possible reasons we could fail to attach PID and append these newline terminated reason strings to initialized BUFFER. '\0' termination @@ -57,7 +58,6 @@ extern void (linux_ptrace_test_ret_to_nx_instr) (void); #include #include #include -#include #include #endif /* defined __i386__ || defined __x86_64__ */ diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh index b8ee06ffc84..123249e7f0c 100644 --- a/gdb/contrib/ari/gdb_ari.sh +++ b/gdb/contrib/ari/gdb_ari.sh @@ -358,7 +358,7 @@ Do not include gnu-regex.h, instead include gdb_regex.h" BEGIN { doc["stat.h"] = "\ Do not include stat.h or sys/stat.h, instead include gdb_stat.h" category["stat.h"] = ari_regression - fix("stat.h", "gdb/gdb_stat.h", 1) + fix("stat.h", "common/gdb_stat.h", 1) } /^#[[:space:]]*include[[:space:]]*.stat\.h./ \ || /^#[[:space:]]*include[[:space:]]*.sys\/stat\.h./ { @@ -367,7 +367,7 @@ Do not include stat.h or sys/stat.h, instead include gdb_stat.h" BEGIN { doc["wait.h"] = "\ Do not include wait.h or sys/wait.h, instead include gdb_wait.h" - fix("wait.h", "gdb/gdb_wait.h", 2); + fix("wait.h", "common/gdb_wait.h", 2); category["wait.h"] = ari_regression } /^#[[:space:]]*include[[:space:]]*.wait\.h./ \ diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 3513dad1d81..7025e582eea 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,17 @@ +2012-11-15 Pierre Muller + + * configure.ac (AC_CHECK_HEADERS): Add wait.h header. + * config.in: Regenerate. + * configure: Regenerate. + * linux-low.c: Use "gdb_stat.h" header instead of header. + Use "gdb_wait.h" header instead of header. + * lynx-low.c: Use "gdb_wait.h" header instead of header. + * remote-utils.c: Use "gdb_stat.h" header instead of + header. + * server.c: Remove HAVE_WAIT_H conditional. Use "gdb_wait.h" header + instead of header. + * spu-low.c: Use "gdb_wait.h" header instead of header. + 2012-11-13 Markus Metzger * Makefile.in: (INTERNAL_CFLAGS): Add -DGDBSERVER diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index bacf005e2f0..63ff9b21663 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -217,6 +217,9 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF +/* Define to 1 if you have the header file. */ +#undef HAVE_WAIT_H + /* Checking if errno must be defined */ #undef MUST_DEFINE_ERRNO diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 69953c25c57..b451a22bc32 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4419,7 +4419,7 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach cd "$ac_popdir" -for ac_header in sgtty.h termio.h termios.h sys/reg.h string.h proc_service.h sys/procfs.h thread_db.h linux/elf.h stdlib.h unistd.h errno.h fcntl.h signal.h sys/file.h malloc.h sys/ioctl.h netinet/in.h sys/socket.h netdb.h netinet/tcp.h arpa/inet.h sys/wait.h sys/un.h +for ac_header in sgtty.h termio.h termios.h sys/reg.h string.h proc_service.h sys/procfs.h thread_db.h linux/elf.h stdlib.h unistd.h errno.h fcntl.h signal.h sys/file.h malloc.h sys/ioctl.h netinet/in.h sys/socket.h netdb.h netinet/tcp.h arpa/inet.h sys/wait.h wait.h sys/un.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index dc3c3cdd707..46f5dc024dc 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -55,7 +55,7 @@ AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl stdlib.h unistd.h dnl errno.h fcntl.h signal.h sys/file.h malloc.h dnl sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl - netinet/tcp.h arpa/inet.h sys/wait.h sys/un.h) + netinet/tcp.h arpa/inet.h sys/wait.h wait.h sys/un.h) AC_CHECK_FUNCS(pread pwrite pread64 readlink) AC_REPLACE_FUNCS(vasprintf vsnprintf) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index a476031faf4..2de46d288b6 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -21,7 +21,7 @@ #include "linux-osdata.h" #include "agent.h" -#include +#include "gdb_wait.h" #include #include #include @@ -40,7 +40,7 @@ #include #include #include -#include +#include "gdb_stat.h" #include #include #ifndef ELFMAG0 diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c index 2c7ab6e3dfa..1a4757e1c34 100644 --- a/gdb/gdbserver/lynx-low.c +++ b/gdb/gdbserver/lynx-low.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include "gdb_wait.h" #include int using_threads = 1; diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 63a3e80e60f..adc8783ec5f 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -56,7 +56,7 @@ #if HAVE_ARPA_INET_H #include #endif -#include +#include "gdb_stat.h" #if HAVE_ERRNO_H #include #endif diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index c611b7d90fa..fae919913ee 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -27,9 +27,7 @@ #if HAVE_SIGNAL_H #include #endif -#if HAVE_SYS_WAIT_H -#include -#endif +#include "gdb_wait.h" /* The thread set with an `Hc' packet. `Hc' is deprecated in favor of `vCont'. Note the multi-process extensions made `vCont' a diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 2265fad23f6..f3ee1d95e2a 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -20,7 +20,7 @@ #include "server.h" -#include +#include "gdb_wait.h" #include #include #include -- 2.39.2