1998-10-12 Jason Molenda (jsm@bugshack.cygnus.com)

        * configure.in: Check for sys/debugreg.h, asm/debugreg.h.
        * i386v-nat.c: Include asm/debugreg.h, sys/debugreg.h if it is not
        present.

This is to work around a conflict where the Linux 2.1.x kernel and glibc
2.0.x are not in sync; including <sys/debugreg.h> will result in an error.
With luck, these losers will get their act together and we can trash
this hack in the near future.

5 files changed, 25 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b6e3b6d..d698319 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+1998-10-12  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* configure.in: Check for sys/debugreg.h, asm/debugreg.h.
+	* i386v-nat.c: Include asm/debugreg.h, sys/debugreg.h if it is not
+	present.
+
 Sun Oct 11 12:08:07 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
 
 	* dwarf2read.c (dwarf2_build_psymtabs_hard):  Do not adjust the
diff --git a/gdb/config.in b/gdb/config.in
index 4491be8..088d438 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -199,6 +199,9 @@
 /* Define if you have the <argz.h> header file.  */
 #undef HAVE_ARGZ_H
 
+/* Define if you have the <asm/debugreg.h> header file.  */
+#undef HAVE_ASM_DEBUGREG_H
+
 /* Define if you have the <ctype.h> header file.  */
 #undef HAVE_CTYPE_H
 
diff --git a/gdb/configure b/gdb/configure
index d2af77f..ad7f631 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -21,12 +21,10 @@ ac_help="$ac_help
   --enable-build-warnings Enable compiler warnings if gcc is used"
 ac_help="$ac_help
   --with-mmalloc          Use memory mapped malloc package"
-# start-sanitize-carp
 ac_help="$ac_help
   --enable-carp        Configure alternative readaptive paradigm "
 ac_help="$ac_help
   --enable-targets        alternative target configurations"
-# end-sanitize-carp
 ac_help="$ac_help
   --enable-ide            Enable IDE support"
 ac_help="$ac_help
@@ -3138,7 +3136,7 @@ for ac_hdr in ctype.h curses.h endian.h libintl.h limits.h link.h \
                  memory.h objlist.h ptrace.h sgtty.h stddef.h stdlib.h \
                  string.h strings.h sys/procfs.h sys/ptrace.h sys/reg.h \
                  term.h termio.h termios.h unistd.h wait.h sys/wait.h \
-                 wchar.h wctype.h
+                 wchar.h wctype.h asm/debugreg.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/gdb/configure.in b/gdb/configure.in
index bf4bf20..204a160 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -72,7 +72,7 @@ AC_CHECK_HEADERS(ctype.h curses.h endian.h libintl.h limits.h link.h \
                  memory.h objlist.h ptrace.h sgtty.h stddef.h stdlib.h \
                  string.h strings.h sys/procfs.h sys/ptrace.h sys/reg.h \
                  term.h termio.h termios.h unistd.h wait.h sys/wait.h \
-                 wchar.h wctype.h)
+                 wchar.h wctype.h asm/debugreg.h)
 
 AC_HEADER_STAT
 
diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c
index 250b475..5618687 100644
--- a/gdb/i386v-nat.c
+++ b/gdb/i386v-nat.c
@@ -1,5 +1,5 @@
 /* Intel 386 native support for SYSV systems (pre-SVR4).
-   Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1988, 89, 91, 92, 94, 96, 1998 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -43,8 +43,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
+
+/* FIXME: The following used to be just "#include <sys/debugreg.h>", but
+ * the the Linux 2.1.x kernel and glibc 2.0.x are not in sync; including
+ * <sys/debugreg.h> will result in an error.  With luck, these losers
+ * will get their act together and we can trash this hack in the near future.
+ * --jsm 1998-10-21
+ */
+
 #ifdef TARGET_HAS_HARDWARE_WATCHPOINTS
-#include <sys/debugreg.h>
+# ifdef HAVE_ASM_DEBUGREG_H
+#  include <asm/debugreg.h>
+# else
+#  include <sys/debugreg.h>
+# endif
 #endif
 
 #include <sys/file.h>