From 86c1ed137a1e9cc5ec73cb61836cebf304996aa8 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 23 Sep 2021 18:20:09 +0100 Subject: [PATCH] gdbsupport: remove attempt to define TARGET_WORD_SIZE In the gdbsupport configure.ac file, there is an attempt to define TARGET_WORD_SIZE. This is done by running grep on the file ../bfd/bfd-in3.h. The problem with this is, the file bfd-in3.h is generated into the bfd build directory when bfd is configured, and there is no dependency between the gdbsupport module and the bfd module, so, for example, if I do: $ ../src/configure $ make all-gdbsupport Then bfd will neither be configured, or built. In this case TARGET_WORD_SIZE ends up being defined, but with no value because the grep on bfd-in3.h fails. However, it turns out that this doesn't matter; we don't actually use TARGET_WORD_SIZE anywhere. My proposal in this commit is to just remove the definition of TARGET_WORD_SIZE, the alternative would be to add a dependency between configure-gdbsupport and configure-bfd into Makefile.def, but adding a dependency for something we don't need seems pretty pointless. --- gdbsupport/config.in | 3 --- gdbsupport/configure | 7 ------- gdbsupport/configure.ac | 4 ---- 3 files changed, 14 deletions(-) diff --git a/gdbsupport/config.in b/gdbsupport/config.in index f46e2612c74..e4e6fc062cc 100644 --- a/gdbsupport/config.in +++ b/gdbsupport/config.in @@ -354,9 +354,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to the word size for the target. */ -#undef TARGET_WORD_SIZE - /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE diff --git a/gdbsupport/configure b/gdbsupport/configure index a9dd02c5b72..08800228aa5 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -10286,13 +10286,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -TARGET_WORD_SIZE=`sed -n 's,#define BFD_ARCH_SIZE \(.*\)$,\1,p' ../bfd/bfd-in3.h` - -cat >>confdefs.h <<_ACEOF -#define TARGET_WORD_SIZE $TARGET_WORD_SIZE -_ACEOF - - case ${host} in *mingw32*) diff --git a/gdbsupport/configure.ac b/gdbsupport/configure.ac index a8fcfe24c32..f10a856fe24 100644 --- a/gdbsupport/configure.ac +++ b/gdbsupport/configure.ac @@ -59,10 +59,6 @@ GDB_AC_PTRACE # Detect support warning flags. AM_GDB_WARNINGS -TARGET_WORD_SIZE=`sed -n 's,#define BFD_ARCH_SIZE \(.*\)$,\1,p' ../bfd/bfd-in3.h` -AC_DEFINE_UNQUOTED(TARGET_WORD_SIZE, $TARGET_WORD_SIZE, - [Define to the word size for the target.]) - case ${host} in *mingw32*) AC_DEFINE(USE_WIN32API, 1, -- 2.30.2