From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Fri, 25 Dec 2015 18:27:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'leaf/vendor/GDB'
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/8357968c07f8a1c6a7938f45608a478a8fb30c88

Merge remote-tracking branch 'leaf/vendor/GDB'

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
---

8357968c07f8a1c6a7938f45608a478a8fb30c88
diff --cc contrib/gdb-7/gdb/defs.h
index 99421e1e70,ccdab18677..0bd8304002
--- a/contrib/gdb-7/gdb/defs.h
+++ b/contrib/gdb-7/gdb/defs.h
@@@ -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,
diff --cc contrib/gdb-7/gdb/main.c
index 09c5fd9d8e,aecd60afe6..5fec25c61e
--- a/contrib/gdb-7/gdb/main.c
+++ b/contrib/gdb-7/gdb/main.c
@@@ -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.  */
diff --cc contrib/gdb-7/gdb/osabi.c
index c6ad974b9e,3581eb334c..731ade850c
--- a/contrib/gdb-7/gdb/osabi.c
+++ b/contrib/gdb-7/gdb/osabi.c
@@@ -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))