Merge remote-tracking branch 'leaf/vendor/GDB'
authorAntonio Huete Jimenez <tuxillo@quantumachine.net>
Fri, 25 Dec 2015 18:27:59 +0000 (19:27 +0100)
committerAntonio Huete Jimenez <tuxillo@quantumachine.net>
Fri, 25 Dec 2015 18:27:59 +0000 (19:27 +0100)
Conflicts:
contrib/gcc-4.7/gcc/doc/include/gpl_v3.texi
contrib/gdb-7/gdb/common/ptid.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/main.c
contrib/gdb-7/gdb/osabi.c
contrib/gdb-7/include/libiberty.h

1  2 
contrib/gdb-7/gdb/amd64-tdep.h
contrib/gdb-7/gdb/defs.h
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/inferior.c
contrib/gdb-7/gdb/main.c
contrib/gdb-7/gdb/osabi.c
contrib/gdb-7/include/elf/common.h

Simple merge
@@@ -794,11 -675,8 +676,7 @@@ extern int (*deprecated_ui_load_progres
  extern void initialize_progspace (void);
  extern void initialize_inferiors (void);
  
- /* For DragonFly kgdb */
- extern int kernel_debugger;
- /* Special block numbers */
+ /* * Special block numbers */
 -
  enum block_enum
  {
    GLOBAL_BLOCK = 0,
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -560,15 -706,9 +708,12 @@@ captured_main (void *data
            xfree (interpreter_p);
            interpreter_p = xstrdup (INTERP_TUI);
  #else
-           fprintf_unfiltered (gdb_stderr,
-                               _("%s: TUI mode is not supported\n"),
-                               argv[0]);
-           exit (1);
+           error (_("%s: TUI mode is not supported"), gdb_program_name);
  #endif
            break;
 +        case OPT_KGDB:
 +          kernel_debugger = 1;
 +          break;
          case OPT_WINDOWS:
            /* FIXME: cagney/2003-03-01: Not sure if this option is
                 actually useful, and if it is, what it should do.  */
@@@ -491,18 -508,9 +508,18 @@@ generic_elf_osabi_sniff_abi_tag_section
          return;
        }
  
 +      /* DragonFly.  */
 +      if (check_note (abfd, sect, note, &sectsize, "DragonFly", 4,
 +                    NT_DRAGONFLY_ABI_TAG))
 +      {
 +        /* There is no need to check the version yet.  */
 +        *osabi = GDB_OSABI_DRAGONFLY;
 +        return;
 +      }
 +
        return;
      }
-       
    /* .note.netbsd.ident notes, used by NetBSD.  */
    if (strcmp (name, ".note.netbsd.ident") == 0
        && check_note (abfd, sect, note, &sectsize, "NetBSD", 4, NT_NETBSD_IDENT))
Simple merge