diff options
| author | Mark Peek <mp@FreeBSD.org> | 2002-10-12 17:56:57 +0000 |
|---|---|---|
| committer | Mark Peek <mp@FreeBSD.org> | 2002-10-12 17:56:57 +0000 |
| commit | aee7842826e1d792e608e1cd681f8c1a607e0463 (patch) | |
| tree | 11bb20a9df72ab4830e7ff3d5e48f34e5d55b2a1 /contrib | |
| parent | ba3e1918be9eb3871f9b92881261f8c42ea4e98d (diff) | |
| download | src-aee7842826e1d792e608e1cd681f8c1a607e0463.tar.gz src-aee7842826e1d792e608e1cd681f8c1a607e0463.zip | |
Resolve conflicts with gdb-5.2.1 import.
Notes
Notes:
svn path=/head/; revision=104993
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gdb/gdb/config/i386/tm-fbsd.h | 4 | ||||
| -rw-r--r-- | contrib/gdb/gdb/gdbserver/gdbreplay.c | 10 | ||||
| -rw-r--r-- | contrib/gdb/gdb/version.in | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/contrib/gdb/gdb/config/i386/tm-fbsd.h b/contrib/gdb/gdb/config/i386/tm-fbsd.h index 85b648027c3a..0f8d0f08b49f 100644 --- a/contrib/gdb/gdb/config/i386/tm-fbsd.h +++ b/contrib/gdb/gdb/config/i386/tm-fbsd.h @@ -26,6 +26,10 @@ #define HAVE_I387_REGS #include "i386/tm-i386.h" +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + /* FreeBSD/ELF uses stabs-in-ELF with the DWARF register numbering scheme by default, so we must redefine STAB_REG_TO_REGNUM. This messes up the floating-point registers for a.out, but there is not diff --git a/contrib/gdb/gdb/gdbserver/gdbreplay.c b/contrib/gdb/gdb/gdbserver/gdbreplay.c index e13f625a691d..fbcd3c756b92 100644 --- a/contrib/gdb/gdb/gdbserver/gdbreplay.c +++ b/contrib/gdb/gdb/gdbserver/gdbreplay.c @@ -42,6 +42,16 @@ #include <string.h> #endif +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif +#ifdef HAVE_STRING_H +#include <string.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + /* Sort of a hack... */ #define EOL (EOF - 1) diff --git a/contrib/gdb/gdb/version.in b/contrib/gdb/gdb/version.in index 3a8c804eefae..b8cbd65428fd 100644 --- a/contrib/gdb/gdb/version.in +++ b/contrib/gdb/gdb/version.in @@ -1 +1 @@ -5.2.0 (FreeBSD) 20020627 +5.2.1 (FreeBSD) |