Taken from upstream, removed ChangeLog.

From 6930bffe3373690b3431d6291f9f7c116d6a1ec4 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 30 May 2020 18:35:59 +0000
Subject: [PATCH] hurd: fix gnu_debug_flag type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes

../../gdb/gnu-nat.c:96:6: error: conflicting declaration ‘bool gnu_debug_flag’
   96 | bool gnu_debug_flag = false;
../../gdb/gnu-nat.c: In function ‘void _initialize_gnu_nat()’:
../../gdb/gnu-nat.c:3511:7: error: cannot

gdb/ChangeLog:

	* gnu-nat.h (gnu_debug_flag): Set type to bool.
---
 gdb/ChangeLog | 4 ++++
 gdb/gnu-nat.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index 77c57817b2..766f716587 100644
--- a/gdb/gnu-nat.h
+++ b/gdb/gnu-nat.h
@@ -111,7 +111,7 @@ extern char *proc_string (struct proc *proc);
 	      __proc_pid (__proc), __proc->tid, \
 	      host_address_to_string (__proc) , ##args); } while (0)
 
-extern int gnu_debug_flag;
+extern bool gnu_debug_flag;
 
 #define debug(msg, args...) \
  do { if (gnu_debug_flag) \
-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

commit 366f550a593c7e6bae3699a4b6d65fe937af5603
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat May 30 18:41:30 2020 +0000

    hurd: add missing include
    
    Fixes
    
    ../../gdb/gnu-nat.c:2522:14: error: ‘target_gdbarch’ was not declared in this scope; did you mean ‘target_detach’?
     2522 |    paddress (target_gdbarch (), memaddr), pulongest (len),
    
    gdb/Changelog:
    
            * gnu-nat.c: Include "gdbarch.h".

diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 3b438a9a43..9b93488b41 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -64,6 +64,7 @@ extern "C"
 #include "language.h"
 #include "target.h"
 #include "gdbsupport/gdb_wait.h"
+#include "gdbarch.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 href='/guix/log/?id=5ede50b850df9d0a7bd6f5e27def1d783c0f08a4'>root</a>/<a href='/guix/log/gnu?id=5ede50b850df9d0a7bd6f5e27def1d783c0f08a4'>gnu</a>/<a href='/guix/log/gnu/packages?id=5ede50b850df9d0a7bd6f5e27def1d783c0f08a4'>packages</a>/<a href='/guix/log/gnu/packages/assembly.scm?id=5ede50b850df9d0a7bd6f5e27def1d783c0f08a4'>assembly.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/assembly.scm?id=5ede50b850df9d0a7bd6f5e27def1d783c0f08a4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-02-19 06:00:31 +0100'>2018-02-19</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=e51b3145caa8126164fc533f77b8cb39c51df934'>gnu: nasm: Update to 2.13.03.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/assembly.scm (nasm): Update to 2.13.03.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-12-31 22:18:22 +0100'>2017-12-31</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=55dee52b9c4dbb256ae9c5816efd13a019e55ed0'>gnu: nasm: Update to 2.13.02.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/assembly.scm (nasm): Update to 2.13.02.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-10-05 10:36:06 -0400'>2017-10-05</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=5fe56448f3fa61902521c41ab00cf4aa1c672c92'>gnu: lightning: Update to 2.1.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/assembly.scm (lightning): Update to 2.1.2.
</span></span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2017-06-20 22:16:45 +0200'>2017-06-20</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=3f56740d7231b98d7b0100233d965d82e17cfede'>gnu: nasm: Update to 2.13.01.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/assembly.scm (nasm): Update to 2.13.01.
[arguments]: Adjust Makefile substitutions.
</span></span></td><td>Marius Bakke</td></tr>