Merge branch 'vendor/GDB'
authorJohn Marino <draco@marino.st>
Sat, 5 Oct 2013 22:52:30 +0000 (00:52 +0200)
committerJohn Marino <draco@marino.st>
Sat, 5 Oct 2013 22:52:30 +0000 (00:52 +0200)
1  2 
contrib/gdb-7/gdb/amd64-tdep.h
contrib/gdb-7/gdb/configure.host
contrib/gdb-7/gdb/configure.tgt
contrib/gdb-7/gdb/defs.h
contrib/gdb-7/gdb/exec.c
contrib/gdb-7/gdb/i386-tdep.h
contrib/gdb-7/gdb/i386bsd-nat.c
contrib/gdb-7/gdb/i386fbsd-tdep.c
contrib/gdb-7/gdb/main.c
contrib/gdb-7/gdb/osabi.c
contrib/gdb-7/include/elf/common.h

Simple merge
Simple merge
@@@ -194,16 -198,11 +198,16 @@@ i[34567]86-*-netbsd* | i[34567]86-*-kne
  i[34567]86-*-openbsd*)
        # Target: OpenBSD/i386
        gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
-                       bsd-uthread.o corelow.o solib.o solib-svr4.o"
+                       bsd-uthread.o solib-svr4.o"
        ;;
 +i[34567]86-*-dragonfly*)
 +      # Target: DragonFly/i386
 +      gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
 +                      i386dfly-tdep.o bsd-uthread.o corelow.o solib.o solib-svr4.o"
 +      ;;
  i[34567]86-*-nto*)
        # Target: Intel 386 running qnx6.
-       gdb_target_obs="i386-tdep.o i387-tdep.o corelow.o solib.o solib-svr4.o \
+       gdb_target_obs="i386-tdep.o i387-tdep.o solib-svr4.o \
                        i386-nto-tdep.o nto-tdep.o"
        build_gdbserver=yes
        ;;
@@@ -637,14 -668,8 +673,14 @@@ x86_64-*-openbsd*
        # Target: OpenBSD/amd64
        gdb_target_obs="amd64-tdep.o amd64obsd-tdep.o i386-tdep.o \
                        i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
-                       bsd-uthread.o corelow.o solib.o solib-svr4.o"
+                       bsd-uthread.o solib-svr4.o"
        ;;
 +x86_64-*-dragonfly*)
 +      # Target: DragonFly/amd64
 +      gdb_target_obs="amd64-tdep.o amd64dfly-tdep.o i386-tdep.o \
 +                      i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o i386dfly-tdep.o \
 +                      i386dfly-tdep.o bsd-uthread.o corelow.o solib.o solib-svr4.o"
 +      ;;
  xtensa*-*-linux*)     gdb_target=linux
        # Target: GNU/Linux Xtensa
        gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -90,16 -96,8 +96,11 @@@ int return_child_result_value = -1
  /* GDB as it has been invoked from the command line (i.e. argv[0]).  */
  static char *gdb_program_name;
  
 +/* DragonFly kgdb support */
 +int kernel_debugger;
 +
  static void print_gdb_help (struct ui_file *);
  
- /* These two are used to set the external editor commands when gdb is
-    farming out files to be edited by another program.  */
- extern char *external_editor_command;
  /* Relocate a file or directory.  PROGNAME is the name by which gdb
     was invoked (i.e., argv[0]).  INITIAL is the default value for the
     file or directory.  FLAG is true if the value is relocatable, false
@@@ -395,9 -441,10 +444,11 @@@ captured_main (void *data
        OPT_ANNOTATE,
        OPT_STATISTICS,
        OPT_TUI,
 +      OPT_KGDB,
        OPT_NOWINDOWS,
-       OPT_WINDOWS
+       OPT_WINDOWS,
+       OPT_IX,
+       OPT_IEX
      };
      static struct option long_options[] =
      {
Simple merge
Simple merge