diff options
| -rw-r--r-- | contrib/gdb/gdb/config/i386/tm-fbsd.h | 2 | ||||
| -rw-r--r-- | contrib/gdb/gdb/defs.h | 6 | ||||
| -rw-r--r-- | contrib/gdb/gdb/gdbserver/gdbreplay.c | 11 | ||||
| -rw-r--r-- | contrib/gdb/gdb/i386bsd-nat.c | 6 | ||||
| -rw-r--r-- | contrib/gdb/gdb/target.c | 6 | ||||
| -rw-r--r-- | contrib/gdb/gdb/target.h | 3 | ||||
| -rw-r--r-- | contrib/gdb/gdb/version.in | 2 |
7 files changed, 7 insertions, 29 deletions
diff --git a/contrib/gdb/gdb/config/i386/tm-fbsd.h b/contrib/gdb/gdb/config/i386/tm-fbsd.h index 0f8d0f0..5c819ce 100644 --- a/contrib/gdb/gdb/config/i386/tm-fbsd.h +++ b/contrib/gdb/gdb/config/i386/tm-fbsd.h @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD$ */ - #ifndef TM_FBSD_H #define TM_FBSD_H diff --git a/contrib/gdb/gdb/defs.h b/contrib/gdb/gdb/defs.h index c374a26..b6e7953 100644 --- a/contrib/gdb/gdb/defs.h +++ b/contrib/gdb/gdb/defs.h @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD$ */ - #ifndef DEFS_H #define DEFS_H @@ -812,6 +810,10 @@ enum lval_type struct frame_info; +/* From readline (but not in any readline .h files). */ + +extern char *tilde_expand (char *); + /* Control types for commands */ enum misc_command_type diff --git a/contrib/gdb/gdb/gdbserver/gdbreplay.c b/contrib/gdb/gdb/gdbserver/gdbreplay.c index fbcd3c7..8c57906 100644 --- a/contrib/gdb/gdb/gdbserver/gdbreplay.c +++ b/contrib/gdb/gdb/gdbserver/gdbreplay.c @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD$ */ - #include "config.h" #include <stdio.h> #include <sys/file.h> @@ -32,15 +30,6 @@ #include <ctype.h> #include <fcntl.h> #include <errno.h> -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_STRING_H -#include <string.h> -#endif #ifdef HAVE_STDLIB_H #include <stdlib.h> diff --git a/contrib/gdb/gdb/i386bsd-nat.c b/contrib/gdb/gdb/i386bsd-nat.c index 9cf80f0..5d35830 100644 --- a/contrib/gdb/gdb/i386bsd-nat.c +++ b/contrib/gdb/gdb/i386bsd-nat.c @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD$ */ - #include "defs.h" #include "inferior.h" #include "regcache.h" @@ -307,7 +305,7 @@ i386bsd_dr_set (int regnum, unsigned int value) /* For some mysterious reason, some of the reserved bits in the debug control register get set. Mask these off, otherwise the ptrace call below will fail. */ - dbregs.dr[7] &= ~(0x0000fc00); + dbregs.dr7 &= ~(0x0000fc00); DBREG_DRX ((&dbregs), regnum) = value; @@ -356,7 +354,7 @@ i386bsd_dr_get_status (void) return 0; #endif - return dbregs.dr[6]; + return dbregs.dr6; } #endif /* PT_GETDBREGS */ diff --git a/contrib/gdb/gdb/target.c b/contrib/gdb/gdb/target.c index 631ebda..d5f205f 100644 --- a/contrib/gdb/gdb/target.c +++ b/contrib/gdb/gdb/target.c @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD$ */ - #include "defs.h" #include <errno.h> #include "gdb_string.h" @@ -1363,11 +1361,7 @@ find_core_target (void) for (t = target_structs; t < target_structs + target_struct_size; ++t) { -#if defined(__FreeBSD__) - if ((*t)->to_stratum == (kernel_debugging ? kcore_stratum : core_stratum)) -#else if ((*t)->to_stratum == core_stratum) -#endif { runable = *t; ++count; diff --git a/contrib/gdb/gdb/target.h b/contrib/gdb/gdb/target.h index 41b4a90..b5d036b 100644 --- a/contrib/gdb/gdb/target.h +++ b/contrib/gdb/gdb/target.h @@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD$ */ - #if !defined (TARGET_H) #define TARGET_H @@ -54,7 +52,6 @@ enum strata dummy_stratum, /* The lowest of the low */ file_stratum, /* Executable files, etc */ core_stratum, /* Core dump files */ - kcore_stratum, /* Kernel core files */ download_stratum, /* Downloading of remote targets */ process_stratum, /* Executing processes */ thread_stratum /* Executing threads */ diff --git a/contrib/gdb/gdb/version.in b/contrib/gdb/gdb/version.in index b8cbd65..26d99a2 100644 --- a/contrib/gdb/gdb/version.in +++ b/contrib/gdb/gdb/version.in @@ -1 +1 @@ -5.2.1 (FreeBSD) +5.2.1 |
