aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
blob: 7675eef7c4b11d121631d7db1eabd6f5e1c96b93 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
#                                               -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.68)
AC_INIT([GNU Guix],
  [m4_esyscmd([build-aux/git-version-gen .tarball-version])],
  [bug-guix@gnu.org], [guix],
  [https://www.gnu.org/software/guix/])
AC_CONFIG_AUX_DIR([build-aux])

AM_INIT_AUTOMAKE([1.14 gnu silent-rules subdir-objects \
 color-tests parallel-tests -Woverride -Wno-portability])

# Enable silent rules by default.
AM_SILENT_RULES([yes])

AC_CONFIG_SRCDIR([guix.scm])
AC_CONFIG_MACRO_DIR([m4])

dnl For the C++ code.  This must be used early.
AC_USE_SYSTEM_EXTENSIONS

AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.18.1])

GUIX_SYSTEM_TYPE
GUIX_ASSERT_SUPPORTED_SYSTEM

AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])

AC_ARG_WITH(store-dir,
  AC_HELP_STRING([--with-store-dir=PATH],
    [file name of the store (defaults to /gnu/store)]),
  [storedir="$withval"],
  [storedir="/gnu/store"])
AC_SUBST(storedir)

AC_ARG_WITH([bash-completion-dir],
  AC_HELP_STRING([--with-bash-completion-dir=DIR],
    [name of the Bash completion directory]),
  [bashcompletiondir="$withval"],
  [bashcompletiondir='${sysconfdir}/bash_completion.d'])
AC_SUBST([bashcompletiondir])

AC_ARG_WITH([zsh-completion-dir],
  AC_HELP_STRING([--with-zsh-completion-dir=DIR],
    [name of the Zsh completion directory]),
  [zshcompletiondir="$withval"],
  [zshcompletiondir='${datadir}/zsh/site-functions'])
AC_SUBST([zshcompletiondir])

AC_ARG_WITH([fish-completion-dir],
  AC_HELP_STRING([--with-fish-completion-dir=DIR],
    [name of the Fish completion directory]),
  [fishcompletiondir="$withval"],
  [fishcompletiondir='${datadir}/fish/vendor_completions.d'])
AC_SUBST([fishcompletiondir])

AC_ARG_WITH([selinux-policy-dir],
  AC_HELP_STRING([--with-selinux-policy-dir=DIR],
    [name of the SELinux policy directory]),
  [selinux_policydir="$withval"],
  [selinux_policydir='${datadir}/selinux/'])
AC_SUBST([selinux_policydir])

dnl Better be verbose.
AC_MSG_CHECKING([for the store directory])
AC_MSG_RESULT([$storedir])

AC_ARG_ENABLE([daemon],
  [AS_HELP_STRING([--disable-daemon], [do not build the Nix daemon (C++)])],
  [guix_build_daemon="$enableval"],
  [guix_build_daemon="yes"])

# Prepare a version of $localstatedir & co. that does not contain references
# to shell variables.
guix_prefix="`eval echo $prefix | sed -e"s|NONE|/usr/local|g"`"
guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|$guix_prefix|g"`"
guix_sysconfdir="`eval echo $sysconfdir | sed -e "s|NONE|$guix_prefix|g"`"
guix_sbindir="`eval echo $sbindir | sed -e "s|NONE|$guix_prefix|g"`"
AC_SUBST([guix_localstatedir])
AC_SUBST([guix_sysconfdir])
AC_SUBST([guix_sbindir])

GUIX_CHECK_FILE_NAME_LIMITS([can_run_tests])
AM_CONDITIONAL([CAN_RUN_TESTS], [test "x$can_run_tests" = "xyes"])

dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.)
dnl Make sure they are available.
m4_pattern_forbid([PKG_CHECK_MODULES])
m4_pattern_forbid([GUILE_MODULE_AVAILABLE])
m4_pattern_forbid([^GUILE_P])
m4_pattern_allow([^GUILE_PKG_ERRORS])
m4_pattern_forbid([^GUIX_])

dnl Search for 'guile' and 'guild'.  This macro defines
dnl 'GUILE_EFFECTIVE_VERSION'.
GUILE_PKG([3.0 2.2])
GUILE_PROGS
if test "x$GUILD" = "x"; then
   AC_MSG_ERROR(['guild' binary not found; please check your Guile installation.])
fi

if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then
  PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3])
fi

dnl Installation directories for .scm and .go files.
guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
AC_SUBST([guilemoduledir])
AC_SUBST([guileobjectdir])

dnl The GnuTLS bindings are necessary for substitutes over HTTPS and for 'guix
dnl pull', among other things.
GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
if test "x$have_gnutls" != "xyes"; then
  AC_MSG_ERROR([The Guile bindings of GnuTLS are missing; please install them.])
fi

dnl Check for Guile-Git.
GUILE_MODULE_AVAILABLE([have_guile_git], [(git)])
if test "x$have_guile_git" != "xyes"; then
  AC_MSG_ERROR([Guile-Git is missing; please install it.])
fi

dnl Check for Guile-JSON.
GUIX_CHECK_GUILE_JSON
if test "x$guix_cv_have_recent_guile_json" != "xyes"; then
  AC_MSG_ERROR([Guile-JSON is missing; please install it.])
fi

dnl Guile-Sqlite3 is used by the (guix store ...) modules.
GUIX_CHECK_GUILE_SQLITE3
if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then
  AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.])
fi

GUIX_CHECK_GUILE_GCRYPT
if test "x$guix_cv_have_recent_guile_gcrypt" != "xyes"; then
  AC_MSG_ERROR([A recent Guile-Gcrypt could not be found; please install it.])
fi

dnl Guile-newt is used by the graphical installer.
GUILE_MODULE_AVAILABLE([have_guile_newt], [(newt)])

AC_ARG_ENABLE([installer],
    AS_HELP_STRING([--enable-installer], [Build the graphical installer sources.]))

AS_IF([test "x$enable_installer" = "xyes"], [
if test "x$have_guile_newt" != "xyes"; then
  AC_MSG_ERROR([Guile-newt could not be found; please install it.])
fi
])

AM_CONDITIONAL([ENABLE_INSTALLER],
  [test "x$enable_installer" = "xyes"])

dnl Make sure we have a full-fledged Guile.
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])

dnl Make sure we don't suffer from the bug in 'equal?' wrt. syntax objects
dnl found in 2.2.1.  See <https://bugs.gnu.org/29903>.
GUIX_ASSERT_SYNTAX_OBJECT_EQUAL

AC_PROG_SED

dnl Decompressors, for use by the substituter and other modules.
AC_PATH_PROG([GZIP], [gzip])
AC_PATH_PROG([BZIP2], [bzip2])
AC_PATH_PROG([XZ], [xz])
AC_SUBST([GZIP])
AC_SUBST([BZIP2])
AC_SUBST([XZ])

AC_ARG_WITH([nix-prefix],
  [AS_HELP_STRING([--with-nix-prefix=DIR],
    [search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
  [case "$withval" in
    yes|no) ;;
    *)
      NIX_PREFIX="$withval"
      PATH="$NIX_PREFIX/bin:$PATH"; export PATH
      AC_SUBST([NIX_PREFIX])
      ;;
   esac],
  [])

AC_PATH_PROG([NIX_HASH], [nix-hash])
if test "x$guix_build_daemon$NIX_HASH" = "xno"; then
   AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.])
fi

AC_ARG_WITH([nixpkgs],
  [AS_HELP_STRING([--with-nixpkgs=DIR],
    [search for Nixpkgs in DIR (for testing purposes only)])],
  [case "$withval" in
    yes|no) AC_MSG_ERROR([Please use `--with-nixpkgs=DIR'.]);;
    *)      NIXPKGS="$withval";;
   esac],
  [])

AC_MSG_CHECKING([for Nixpkgs source tree])
if test -f "$NIXPKGS/default.nix"; then
   AC_MSG_RESULT([$NIXPKGS])
   AC_SUBST([NIXPKGS])
else
   AC_MSG_RESULT([not found])
fi

LIBGCRYPT_LIBDIR="no"
LIBGCRYPT_PREFIX="no"

AC_ARG_WITH([libgcrypt-prefix],
  [AS_HELP_STRING([--with-libgcrypt-prefix=DIR], [search for GNU libgcrypt in DIR])],
  [case "$withval" in
    yes|no)
      ;;
    *)
      LIBGCRYPT_PREFIX="$withval"
      LIBGCRYPT_LIBDIR="$withval/lib"
      ;;
   esac])

AC_ARG_WITH([libgcrypt-libdir],
  [AS_HELP_STRING([--with-libgcrypt-libdir=DIR],
     [search for GNU libgcrypt's shared library in DIR])],
  [case "$withval" in
    yes|no)
      LIBGCRYPT_LIBDIR="no"
      ;;
    *)
      LIBGCRYPT_LIBDIR="$withval"
      ;;
   esac])

dnl If none of the --with-libgcrypt-* options was used, try to determine the
dnl the library directory.
case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in
  xnono)
    GUIX_LIBGCRYPT_LIBDIR([LIBGCRYPT_LIBDIR])
    ;;
esac

AC_SUBST([LIBGCRYPT_PREFIX])
AC_SUBST([LIBGCRYPT_LIBDIR])

dnl Library name of zlib suitable for 'dynamic-link'.
GUIX_LIBZ_LIBDIR([libz_libdir])
if test "x$libz_libdir" = "x"; then
  LIBZ="libz"
else
  LIBZ="$libz_libdir/libz"
fi
AC_MSG_CHECKING([for zlib's shared library name])
AC_MSG_RESULT([$LIBZ])
AC_SUBST([LIBZ])

dnl Library name of lzlib suitable for 'dynamic-link'.
GUIX_LIBLZ_FILE_NAME([LIBLZ])
if test "x$LIBLZ" = "x"; then
  LIBLZ="liblz"
else
  # Strip the .so or .so.1 extension since that's what 'dynamic-link' expects.
  LIBLZ="`echo $LIBLZ | sed -es'/\.so\(\.[[0-9.]]\+\)\?//g'`"
fi
AC_SUBST([LIBLZ])

dnl Check for Guile-SSH, for the (guix ssh) module.
GUIX_CHECK_GUILE_SSH
AM_CONDITIONAL([HAVE_GUILE_SSH],
  [test "x$guix_cv_have_recent_guile_ssh" = "xyes"])

AC_CACHE_SAVE

m4_include([config-daemon.ac])

dnl `dot' (from the Graphviz package) is only needed for maintainers.
dnl See `Building from Git' in the manual for more info.
AM_MISSING_PROG([DOT], [dot])

dnl Manual pages.
AM_MISSING_PROG([HELP2MAN], [help2man])

dnl Documentation translation.
AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo])

case "$storedir" in
  /gnu/store)
    ;;
  *)
    AC_MSG_WARN([Using a store directory other than '/gnu/store' will prevent you])
    AC_MSG_WARN([from downloading substitutes from gnu.org.])
    ;;
esac

AC_CONFIG_FILES([Makefile
                 po/guix/Makefile.in
                 po/packages/Makefile.in
                 etc/guix-daemon.cil
                 guix/config.scm])

AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm])
AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
  [chmod +x pre-inst-env])

AC_OUTPUT
>
++ svr4_fetch_objfile_link_map);
++
++ /* Hurd uses SVR4-style shared libraries. */
++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
++
++ /* Hurd uses the dynamic linker included in the GNU C Library. */
++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver);
++
++ tdep->gregset_reg_offset = amd64_gnu_gregset_reg_offset;
++ tdep->gregset_num_regs = ARRAY_SIZE (amd64_gnu_gregset_reg_offset);
++ tdep->sizeof_gregset = 21 * 8; /* sizeof (struct i386_thread_state); */
++
++ tdep->sigtramp_p = amd64_gnu_sigtramp_p;
++ tdep->sigcontext_addr = amd64_gnu_sigcontext_addr;
++ tdep->sc_reg_offset = amd64_gnu_sc_reg_offset;
++ tdep->sc_num_regs = ARRAY_SIZE (amd64_gnu_sc_reg_offset);
++
++ /* Hurd uses SVR4-style shared libraries. */
++ set_solib_svr4_fetch_link_map_offsets
++ (gdbarch, svr4_lp64_fetch_link_map_offsets);
++}
++
++void _initialize_amd64_gnu_tdep ();
++void
++_initialize_amd64_gnu_tdep ()
++{
++ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
++ GDB_OSABI_HURD, amd64_gnu_init_abi);
++}
+diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-x86-gnu.h
+similarity index 83%
+rename from gdb/config/i386/nm-i386gnu.h
+rename to gdb/config/i386/nm-x86-gnu.h
+index d2d5de83948..ed4d1729227 100644
+--- a/gdb/config/i386/nm-i386gnu.h
++++ b/gdb/config/i386/nm-x86-gnu.h
+@@ -22,9 +22,16 @@
+ /* Thread flavors used in re-setting the T bit. */
+ #define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE
+ #define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT
++#ifdef __x86_64__
++#define THREAD_STATE_SET_TRACED(state) \
++ ((struct i386_thread_state *) (state))->rfl |= 0x100
++#define THREAD_STATE_CLEAR_TRACED(state) \
++ ((((struct i386_thread_state *) (state))->rfl &= ~0x100), 1)
++#else
+ #define THREAD_STATE_SET_TRACED(state) \
+ ((struct i386_thread_state *) (state))->efl |= 0x100
+ #define THREAD_STATE_CLEAR_TRACED(state) \
+ ((((struct i386_thread_state *) (state))->efl &= ~0x100), 1)
++#endif /* __x86_64__ */
+
+ #endif /* CONFIG_I386_NM_I386GNU_H */
+diff --git a/gdb/config/i386/i386gnu.mn b/gdb/config/i386/x86-gnu.mn
+similarity index 100%
+rename from gdb/config/i386/i386gnu.mn
+rename to gdb/config/i386/x86-gnu.mn
+diff --git a/gdb/configure.host b/gdb/configure.host
+index da71675b201..999af8e59ae 100644
+--- a/gdb/configure.host
++++ b/gdb/configure.host
+@@ -184,6 +184,7 @@ x86_64-*-mingw*) gdb_host=mingw64
+ gdb_host_obs=mingw-hdep.o
+ ;;
+ x86_64-*-cygwin*) gdb_host=cygwin64 ;;
++x86_64-*-gnu*) gdb_host=gnu64 ;;
+ m32r*-*-linux*) gdb_host=linux ;;
+
+ xtensa*-*-linux*) gdb_host=linux ;;
+diff --git a/gdb/configure.nat b/gdb/configure.nat
+index 8b98511cef7..00402f888a9 100644
+--- a/gdb/configure.nat
++++ b/gdb/configure.nat
+@@ -211,23 +211,44 @@ case ${gdb_host} in
+ ;;
+ esac
+ ;;
++ gnu64)
++ case ${gdb_host_cpu} in
++ i386)
++ # Host: x86_64 running the GNU Hurd
++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \
++ x86-nat.o nat/x86-dregs.o \
++ amd64-nat.o fork-child.o \
++ nat/fork-inferior.o \
++ notify_S.o process_reply_S.o msg_reply_S.o \
++ msg_U.o exc_request_U.o exc_request_S.o'
++ HAVE_NATIVE_GCORE_HOST=1
++
++ NAT_FILE='nm-x86-gnu.h'
++ MH_CFLAGS='-D_GNU_SOURCE'
++
++ XM_CLIBS='-lshouldbeinlibc'
++
++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn"
++ ;;
++ esac
++ ;;
+ i386gnu)
+ case ${gdb_host_cpu} in
+ i386)
+ # Host: Intel 386 running the GNU Hurd
+- NATDEPFILES='i386-gnu-nat.o gnu-nat.o \
++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \
+ x86-nat.o nat/x86-dregs.o fork-child.o \
+ nat/fork-inferior.o \
+ notify_S.o process_reply_S.o msg_reply_S.o \
+ msg_U.o exc_request_U.o exc_request_S.o'
+ HAVE_NATIVE_GCORE_HOST=1
+
+- NAT_FILE='nm-i386gnu.h'
++ NAT_FILE='nm-x86-gnu.h'
+ MH_CFLAGS='-D_GNU_SOURCE'
+
+ XM_CLIBS='-lshouldbeinlibc'
+
+- nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn"
++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn"
+ ;;
+ esac
+ ;;
+diff --git a/gdb/configure.tgt b/gdb/configure.tgt
+index 47a674201f9..df9e9917ad1 100644
+--- a/gdb/configure.tgt
++++ b/gdb/configure.tgt
+@@ -328,7 +328,7 @@ i[34567]86-*-linux*)
+ ;;
+ i[34567]86-*-gnu*)
+ # Target: Intel 386 running the GNU Hurd
+- gdb_target_obs="i386-gnu-tdep.o solib-svr4.o"
++ gdb_target_obs="i386-gnu-tdep.o glibc-tdep.o solib-svr4.o"
+ ;;
+ i[34567]86-*-cygwin*)
+ # Target: Intel 386 running win32
+@@ -744,6 +744,10 @@ x86_64-*-openbsd*)
+ x86_64-*-rtems*)
+ gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o"
+ ;;
++x86_64-*-gnu*)
++ # Target: x86_64 running the GNU Hurd
++ gdb_target_obs="amd64-gnu-tdep.o glibc-tdep.o solib-svr4.o"
++ ;;
+ xtensa*-*-*linux*)
+ # Target: GNU/Linux Xtensa
+ gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o"
+diff --git a/gdb/i386-gnu-tdep.c b/gdb/i386-gnu-tdep.c
+index 98e11518a91..5ffc1388ec0 100644
+--- a/gdb/i386-gnu-tdep.c
++++ b/gdb/i386-gnu-tdep.c
+@@ -21,6 +21,7 @@
+ #include "osabi.h"
+ #include "solib-svr4.h"
+
++#include "glibc-tdep.h"
+ #include "i386-tdep.h"
+
+ /* Recognizing signal handler frames. */
+@@ -72,8 +73,7 @@ i386_gnu_sigtramp_start (const frame_info_ptr &this_frame)
+ return pc;
+ }
+
+-/* Return whether THIS_FRAME corresponds to a GNU/Linux sigtramp
+- routine. */
++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */
+
+ static int
+ i386_gnu_sigtramp_p (const frame_info_ptr &this_frame)
+@@ -178,9 +178,18 @@ i386gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+ /* GNU uses ELF. */
+ i386_elf_init_abi (info, gdbarch);
+
++ /* Hurd uses SVR4-style shared libraries. */
++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
+ set_solib_svr4_fetch_link_map_offsets
+ (gdbarch, svr4_ilp32_fetch_link_map_offsets);
+
++ /* Hurd uses the dynamic linker included in the GNU C Library. */
++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver);
++
++ /* Enable TLS support. */
++ set_gdbarch_fetch_tls_load_module_address (gdbarch,
++ svr4_fetch_objfile_link_map);
++
+ tdep->gregset_reg_offset = i386gnu_gregset_reg_offset;
+ tdep->gregset_num_regs = ARRAY_SIZE (i386gnu_gregset_reg_offset);
+ tdep->sizeof_gregset = 19 * 4;
+diff --git a/gdb/i386-gnu-nat.c b/gdb/x86-gnu-nat.c
+similarity index 68%
+rename from gdb/i386-gnu-nat.c
+rename to gdb/x86-gnu-nat.c
+index 52d4a4b7cec..da3b7e923dd 100644
+--- a/gdb/i386-gnu-nat.c
++++ b/gdb/x86-gnu-nat.c
+@@ -34,7 +34,13 @@ extern "C"
+ #include "floatformat.h"
+ #include "regcache.h"
+
++
++#ifdef __x86_64__
++#include "amd64-tdep.h"
++#include "amd64-nat.h"
++#else
+ #include "i386-tdep.h"
++#endif
+
+ #include "inf-child.h"
+ #include "i387-tdep.h"
+@@ -42,21 +48,82 @@ extern "C"
+ /* Offset to the thread_state_t location where REG is stored. */
+ #define REG_OFFSET(reg) offsetof (struct i386_thread_state, reg)
+
++#ifdef __x86_64__
++
+ /* At REG_OFFSET[N] is the offset to the thread_state_t location where
+ the GDB register N is stored. */
+-static int reg_offset[] =
++static int amd64_gnu_thread_state_reg_offset[] =
+ {
+- REG_OFFSET (eax), REG_OFFSET (ecx), REG_OFFSET (edx), REG_OFFSET (ebx),
+- REG_OFFSET (uesp), REG_OFFSET (ebp), REG_OFFSET (esi), REG_OFFSET (edi),
+- REG_OFFSET (eip), REG_OFFSET (efl), REG_OFFSET (cs), REG_OFFSET (ss),
+- REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs)
++ REG_OFFSET (rax), /* %rax */
++ REG_OFFSET (rbx), /* %rbx */
++ REG_OFFSET (rcx), /* %rcx */
++ REG_OFFSET (rdx), /* %rdx */
++ REG_OFFSET (rsi), /* %rsi */
++ REG_OFFSET (rdi), /* %rdi */
++ REG_OFFSET (rbp), /* %rbp */
++ REG_OFFSET (ursp), /* %rsp */
++ REG_OFFSET (r8), /* %r8 ... */
++ REG_OFFSET (r9),
++ REG_OFFSET (r10),
++ REG_OFFSET (r11),
++ REG_OFFSET (r12),
++ REG_OFFSET (r13),
++ REG_OFFSET (r14),
++ REG_OFFSET (r15), /* ... %r15 */
++ REG_OFFSET (rip), /* %rip */
++ REG_OFFSET (rfl), /* %rflags */
++ REG_OFFSET (cs) /* %cs */
+ };
+
+-#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])
++static const int amd64_gnu_thread_state_num_regs =
++ ARRAY_SIZE (amd64_gnu_thread_state_reg_offset);
++
++#define REG_ADDR(state, regnum) \
++ ((char *)(state) + amd64_gnu_thread_state_reg_offset[regnum])
++#define VALID_REGISTER(regnum) \
++ ((regnum) >= 0 && (regnum) < amd64_gnu_thread_state_num_regs)
++#define NUM_GREGS amd64_gnu_thread_state_num_regs
++#define FLAGS_REGISTER rfl
++
++#else
++
++/* At REG_OFFSET[N] is the offset to the thread_state_t location where
++ the GDB register N is stored. */
++static int i386_gnu_thread_state_reg_offset[] =
++{
++ REG_OFFSET (eax), /* %eax */
++ REG_OFFSET (ecx), /* %ecx */
++ REG_OFFSET (edx), /* %edx */
++ REG_OFFSET (ebx), /* %ebx */
++ REG_OFFSET (uesp), /* %esp */
++ REG_OFFSET (ebp), /* %ebp */
++ REG_OFFSET (esi), /* %esi */
++ REG_OFFSET (edi), /* %edi */
++ REG_OFFSET (eip), /* %eip */
++ REG_OFFSET (efl), /* %efl */
++ REG_OFFSET (cs), /* %cs */
++ REG_OFFSET (ss), /* %ss */
++ REG_OFFSET (ds), /* %ds */
++ REG_OFFSET (es), /* %es */
++ REG_OFFSET (fs), /* %fs */
++ REG_OFFSET (gs) /* gs */
++};
++
++static const int i386_gnu_thread_state_num_regs =
++ ARRAY_SIZE (i386_gnu_thread_state_reg_offset);
++
++#define REG_ADDR(state, regnum) \
++ ((char *)(state) + i386_gnu_thread_state_reg_offset[regnum])
++#define VALID_REGISTER(regnum) \
++ ((regnum) >= 0 && (regnum) < i386_gnu_thread_state_num_regs)
++#define NUM_GREGS i386_gnu_thread_state_num_regs
++#define FLAGS_REGISTER efl
++
++#endif /* __x86_64__ */
+
+
+
+-/* The i386 GNU Hurd target. */
++/* The x86 GNU Hurd target. */
+
+ #ifdef i386_DEBUG_STATE
+ using gnu_base_target = x86_nat_target<gnu_nat_target>;
+@@ -64,13 +131,13 @@ using gnu_base_target = x86_nat_target<gnu_nat_target>;
+ using gnu_base_target = gnu_nat_target;
+ #endif
+
+-struct i386_gnu_nat_target final : public gnu_base_target
++struct x86_gnu_nat_target final : public gnu_base_target
+ {
+ void fetch_registers (struct regcache *, int) override;
+ void store_registers (struct regcache *, int) override;
+ };
+
+-static i386_gnu_nat_target the_i386_gnu_nat_target;
++static x86_gnu_nat_target the_x86_gnu_nat_target;
+
+ /* Get the whole floating-point state of THREAD and record the values
+ of the corresponding (pseudo) registers. */
+@@ -105,7 +172,7 @@ fetch_fpregs (struct regcache *regcache, struct proc *thread)
+
+ /* Fetch register REGNO, or all regs if REGNO is -1. */
+ void
+-i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
++x86_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
+ {
+ struct proc *thread;
+ ptid_t ptid = regcache->ptid ();
+@@ -118,7 +185,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
+ error (_("Can't fetch registers from thread %s: No such thread"),
+ target_pid_to_str (ptid).c_str ());
+
+- if (regno < I386_NUM_GREGS || regno == -1)
++ if (VALID_REGISTER (regno) || regno == -1)
+ {
+ thread_state_t state;
+
+@@ -137,7 +204,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
+
+ proc_debug (thread, "fetching all register");
+
+- for (i = 0; i < I386_NUM_GREGS; i++)
++ for (i = 0; i < NUM_GREGS; i++)
+ regcache->raw_supply (i, REG_ADDR (state, i));
+ thread->fetched_regs = ~0;
+ }
+@@ -152,7 +219,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
+ }
+ }
+
+- if (regno >= I386_NUM_GREGS || regno == -1)
++ if (!VALID_REGISTER(regno) || regno == -1)
+ {
+ proc_debug (thread, "fetching floating-point registers");
+
+@@ -195,7 +262,7 @@ store_fpregs (const struct regcache *regcache, struct proc *thread, int regno)
+
+ /* Store at least register REGNO, or all regs if REGNO == -1. */
+ void
+-i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
++x86_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
+ {
+ struct proc *thread;
+ struct gdbarch *gdbarch = regcache->arch ();
+@@ -209,7 +276,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
+ error (_("Couldn't store registers into thread %s: No such thread"),
+ target_pid_to_str (ptid).c_str ());
+
+- if (regno < I386_NUM_GREGS || regno == -1)
++ if (VALID_REGISTER (regno) || regno == -1)
+ {
+ thread_state_t state;
+ thread_state_data_t old_state;
+@@ -230,14 +297,14 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
+
+ /* Save the T bit. We might try to restore the %eflags register
+ below, but changing the T bit would seriously confuse GDB. */
+- trace = ((struct i386_thread_state *)state)->efl & 0x100;
++ trace = ((struct i386_thread_state *)state)->FLAGS_REGISTER & 0x100;
+
+ if (!was_aborted && was_valid)
+ /* See which registers have changed after aborting the thread. */
+ {
+ int check_regno;
+
+- for (check_regno = 0; check_regno < I386_NUM_GREGS; check_regno++)
++ for (check_regno = 0; check_regno < NUM_GREGS; check_regno++)
+ if ((thread->fetched_regs & (1 << check_regno))
+ && memcpy (REG_ADDR (&old_state, check_regno),
+ REG_ADDR (state, check_regno),
+@@ -262,7 +329,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
+
+ proc_debug (thread, "storing all registers");
+
+- for (i = 0; i < I386_NUM_GREGS; i++)
++ for (i = 0; i < NUM_GREGS; i++)
+ if (REG_VALID == regcache->get_register_status (i))
+ regcache->raw_collect (i, REG_ADDR (state, i));
+ }
+@@ -276,11 +343,11 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
+ }
+
+ /* Restore the T bit. */
+- ((struct i386_thread_state *)state)->efl &= ~0x100;
+- ((struct i386_thread_state *)state)->efl |= trace;
++ ((struct i386_thread_state *)state)->FLAGS_REGISTER &= ~0x100;
++ ((struct i386_thread_state *)state)->FLAGS_REGISTER |= trace;
+ }
+
+- if (regno >= I386_NUM_GREGS || regno == -1)
++ if (!VALID_REGISTER (regno) || regno == -1)
+ {
+ proc_debug (thread, "storing floating-point registers");
+
+@@ -295,7 +362,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
+ /* Get debug registers for thread THREAD. */
+
+ static void
+-i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread)
++x86_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread)
+ {
+ mach_msg_type_number_t count = i386_DEBUG_STATE_COUNT;
+ kern_return_t err;
+@@ -310,7 +377,7 @@ i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread)
+ /* Set debug registers for thread THREAD. */
+
+ static void
+-i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread)
++x86_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread)
+ {
+ kern_return_t err;
+
+@@ -324,23 +391,23 @@ i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread)
+ /* Set DR_CONTROL in THREAD. */
+
+ static void
+-i386_gnu_dr_set_control_one (struct proc *thread, void *arg)
++x86_gnu_dr_set_control_one (struct proc *thread, void *arg)
+ {
+ unsigned long *control = (unsigned long *) arg;
+ struct i386_debug_state regs;
+
+- i386_gnu_dr_get (&regs, thread);
++ x86_gnu_dr_get (&regs, thread);
+ regs.dr[DR_CONTROL] = *control;
+- i386_gnu_dr_set (&regs, thread);
++ x86_gnu_dr_set (&regs, thread);
+ }
+
+ /* Set DR_CONTROL to CONTROL in all threads. */
+
+ static void
+-i386_gnu_dr_set_control (unsigned long control)
++x86_gnu_dr_set_control (unsigned long control)
+ {
+ inf_update_procs (gnu_current_inf);
+- inf_threads (gnu_current_inf, i386_gnu_dr_set_control_one, &control);
++ inf_threads (gnu_current_inf, x86_gnu_dr_set_control_one, &control);
+ }
+
+ /* Parameters to set a debugging address. */
+@@ -354,20 +421,20 @@ struct reg_addr
+ /* Set address REGNUM (zero based) to ADDR in THREAD. */
+
+ static void
+-i386_gnu_dr_set_addr_one (struct proc *thread, void *arg)
++x86_gnu_dr_set_addr_one (struct proc *thread, void *arg)
+ {
+ struct reg_addr *reg_addr = (struct reg_addr *) arg;
+ struct i386_debug_state regs;
+
+- i386_gnu_dr_get (&regs, thread);
++ x86_gnu_dr_get (&regs, thread);
+ regs.dr[reg_addr->regnum] = reg_addr->addr;
+- i386_gnu_dr_set (&regs, thread);
++ x86_gnu_dr_set (&regs, thread);
+ }
+
+ /* Set address REGNUM (zero based) to ADDR in all threads. */
+
+ static void
+-i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr)
++x86_gnu_dr_set_addr (int regnum, CORE_ADDR addr)
+ {
+ struct reg_addr reg_addr;
+
+@@ -377,13 +444,13 @@ i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr)
+ reg_addr.addr = addr;
+
+ inf_update_procs (gnu_current_inf);
+- inf_threads (gnu_current_inf, i386_gnu_dr_set_addr_one, &reg_addr);
++ inf_threads (gnu_current_inf, x86_gnu_dr_set_addr_one, &reg_addr);
+ }
+
+ /* Get debug register REGNUM value from only the one LWP of PTID. */
+
+ static unsigned long
+-i386_gnu_dr_get_reg (ptid_t ptid, int regnum)
++x86_gnu_dr_get_reg (ptid_t ptid, int regnum)
+ {
+ struct i386_debug_state regs;
+ struct proc *thread;
+@@ -392,7 +459,7 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum)
+ inf_update_procs (gnu_current_inf);
+
+ thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ());
+- i386_gnu_dr_get (&regs, thread);
++ x86_gnu_dr_get (&regs, thread);
+
+ return regs.dr[regnum];
+ }
+@@ -400,46 +467,50 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum)
+ /* Return the inferior's debug register REGNUM. */
+
+ static CORE_ADDR
+-i386_gnu_dr_get_addr (int regnum)
++x86_gnu_dr_get_addr (int regnum)
+ {
+ gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
+
+- return i386_gnu_dr_get_reg (inferior_ptid, regnum);
++ return x86_gnu_dr_get_reg (inferior_ptid, regnum);
+ }
+
+ /* Get DR_STATUS from only the one thread of INFERIOR_PTID. */
+
+ static unsigned long
+-i386_gnu_dr_get_status (void)
++x86_gnu_dr_get_status (void)
+ {
+- return i386_gnu_dr_get_reg (inferior_ptid, DR_STATUS);
++ return x86_gnu_dr_get_reg (inferior_ptid, DR_STATUS);
+ }
+
+ /* Return the inferior's DR7 debug control register. */
+
+ static unsigned long
+-i386_gnu_dr_get_control (void)
++x86_gnu_dr_get_control (void)
+ {
+- return i386_gnu_dr_get_reg (inferior_ptid, DR_CONTROL);
++ return x86_gnu_dr_get_reg (inferior_ptid, DR_CONTROL);
+ }
+ #endif /* i386_DEBUG_STATE */
+
+-void _initialize_i386gnu_nat ();
++void _initialize_x86_gnu_nat ();
+ void
+-_initialize_i386gnu_nat ()
++_initialize_x86_gnu_nat ()
+ {
+ #ifdef i386_DEBUG_STATE
+- x86_dr_low.set_control = i386_gnu_dr_set_control;
++ x86_dr_low.set_control = x86_gnu_dr_set_control;
+ gdb_assert (DR_FIRSTADDR == 0 && DR_LASTADDR < i386_DEBUG_STATE_COUNT);
+- x86_dr_low.set_addr = i386_gnu_dr_set_addr;
+- x86_dr_low.get_addr = i386_gnu_dr_get_addr;
+- x86_dr_low.get_status = i386_gnu_dr_get_status;
+- x86_dr_low.get_control = i386_gnu_dr_get_control;
++ x86_dr_low.set_addr = x86_gnu_dr_set_addr;
++ x86_dr_low.get_addr = x86_gnu_dr_get_addr;
++ x86_dr_low.get_status = x86_gnu_dr_get_status;
++ x86_dr_low.get_control = x86_gnu_dr_get_control;
++#ifdef __x86_64__
++ x86_set_debug_register_length (8);
++#else
+ x86_set_debug_register_length (4);
++#endif
+ #endif /* i386_DEBUG_STATE */
+
+- gnu_target = &the_i386_gnu_nat_target;
++ gnu_target = &the_x86_gnu_nat_target;
+
+ /* Register the target. */
+- add_inf_child_target (&the_i386_gnu_nat_target);
++ add_inf_child_target (&the_x86_gnu_nat_target);
+ }
+--
+2.46.0
+
+From 7cfe6f639e601d6cca567342360ecbd3cdca128c Mon Sep 17 00:00:00 2001
+From: Flavio Cruz <flaviocruz@gmail.com>
+Date: Wed, 3 Jul 2024 23:05:06 +0100
+Subject: [PATCH 2/2] Hurd: do not include defs.h when compiling MiG stubs
+ since they are compiled as C files
+
+Otherwise, GDB will fail to compile for Hurd.
+---
+ gdb/Makefile.in | 3 ++-
+ gdb/config/i386/x86-gnu.mn | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/Makefile.in b/gdb/Makefile.in
+index 67a15e2cc68..d847a8bad72 100644
+--- a/gdb/Makefile.in
++++ b/gdb/Makefile.in
+@@ -603,11 +603,12 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
+ # your system doesn't have fcntl.h in /usr/include (which is where it
+ # should be according to Posix).
+ DEFS = @DEFS@
++GDB_INCLUDED_HEADER = -include $(srcdir)/defs.h
+ GDB_CFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ -I$(srcdir)/config \
+- -include $(srcdir)/defs.h \
++ $(GDB_INCLUDED_HEADER) \
+ -DLOCALEDIR="\"$(localedir)\"" \
+ $(DEFS)
+
+diff --git a/gdb/config/i386/x86-gnu.mn b/gdb/config/i386/x86-gnu.mn
+index b7414e3bcb4..24c58b02e98 100644
+--- a/gdb/config/i386/x86-gnu.mn
++++ b/gdb/config/i386/x86-gnu.mn
+@@ -21,7 +21,9 @@ MIGCOM = $(MIG) -cc cat - /dev/null
+ | $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h
+
+ # MIG stubs are not yet ready for C++ compilation.
+-%_S.o %_U.o : COMPILE.post += -x c -include gnu-nat-mig.h
++%_S.o %_U.o : COMPILE.post += -x c
++# Do not include defs.h since it requires C++. Rather include our own gnu-nat-mig.h
++%_S.o %_U.o : GDB_INCLUDED_HEADER = -include gnu-nat-mig.h
+
+ NAT_GENERATED_FILES = notify_S.h notify_S.c \
+ process_reply_S.h process_reply_S.c \
+--
+2.46.0
+