From afe8f50f120da68ef4b90bb775e92ebc4b980d8f Mon Sep 17 00:00:00 2001 From: Marek Szulc Date: Fri, 16 Jun 2023 19:05:43 +0200 Subject: [PATCH] amd64-linux-siginfo.c: Adjust include order to avoid gnulib error On Fedora rawhide, after updating to glibc-2.33, I'm seeing the following build failure: CXX nat/amd64-linux-siginfo.o In file included from /usr/include/bits/sigstksz.h:24, from /usr/include/signal.h:315, from ../gnulib/import/signal.h:52, from /ironwood1/sourceware-git/rawhide-gnulib/bld/../../worktree-gnulib/gdbserver/../gdb/nat/amd64-linux-siginfo.c:20: ../gnulib/import/unistd.h:663:3: error: #error "Please include config.h first." 663 | #error "Please include config.h first." | ^~~~~ glibc-2.33 has changed signal.h to now include which, in turn, includes . For a gdb build, this causes the gnulib version of unistd.h to be pulled in first. The build failure shown above happens because gnulib's config.h has not been included before the include of . The fix is simple - we just rearrange the order of the header file includes to make sure that gdbsupport/commondefs.h is included before attempting to include signal.h. Note that gdbsupport/commondefs.h includes . Build and regression tested on Fedora 33. On Fedora rawhide, GDB builds again. gdb/ChangeLog: PR build/27535 * nat/amd64-linux-siginfo.c: Include "gdbsupport/common-defs.h" (which in turn includes ) before include of . Change-Id: I6d5a1073f2b16b81b94bb2e8f897a943701a4744 Origin: upstream, https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=aebc4aa2ece0363c16cab5a546df05220227ec31 Signed-off-by: Marek Szulc --- gdb/nat/amd64-linux-siginfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c index dab52684a..9cb4d9841 100644 --- a/gdb/nat/amd64-linux-siginfo.c +++ b/gdb/nat/amd64-linux-siginfo.c @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include #include "common/common-defs.h" +#include #include "amd64-linux-siginfo.h" #define GDB_SI_SIZE 128 -- 2.34.1