From 6679754127e51d9c3bd0e387fabbe4e71038c8ce Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 19 Sep 2016 16:55:35 +0100 Subject: [PATCH] gdb: Fix build breakage with GCC 4.1 and --disable-nls Ref: https://sourceware.org/ml/gdb-patches/2016-09/msg00203.html The std::{min,max} patch caused build failures when configuring GDB with with --disable-nls and using GCC 4.1. The reason is this bit in common/gdb_locale.h: #ifdef ENABLE_NLS ... #else # define gettext(Msgid) (Msgid) ... #endif This causes problems if the header is first included at any point after "gdb_locale.h". Specifically, the gettext&co declarations in libintl.h: extern char *gettext (__const char *__msgid) __THROW __attribute_format_arg__ (1); end up broken after preprocessing: extern char *(__const char *__msgid) throw () __attribute__ ((__format_arg__ (1))); After the std::min/std::max change to include , this now happens with at least the GCC 4.1 copy of , which includes via , , and . The fix is to simply remove the troublesome *gettext and *textdomain macros, leaving only the _ and N_ ones. gdb/ChangeLog: 2016-09-19 Pedro Alves * common/gdb_locale.h [!ENABLE_NLS] (gettext, dgettext, dcgettext, textdomain, bindtextdomain): Delete macros. * main.c (captured_main) [!ENABLE_NLS]: Skip bintextdomain and textdomain calls. --- gdb/ChangeLog | 7 +++++++ gdb/common/gdb_locale.h | 5 ----- gdb/main.c | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8b1f0bc834d..26b97e6687c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2016-09-19 Pedro Alves + + * common/gdb_locale.h [!ENABLE_NLS] (gettext, dgettext, dcgettext, + textdomain, bindtextdomain): Delete macros. + * main.c (captured_main) [!ENABLE_NLS]: Skip bintextdomain and + textdomain calls. + 2016-09-19 Sergio Durigan Junior * darwin-nat.c (darwin_kill_inferior): Adjusting call to diff --git a/gdb/common/gdb_locale.h b/gdb/common/gdb_locale.h index 686260e921d..f9538a731f0 100644 --- a/gdb/common/gdb_locale.h +++ b/gdb/common/gdb_locale.h @@ -32,11 +32,6 @@ # define N_(String) (String) # endif #else -# define gettext(Msgid) (Msgid) -# define dgettext(Domainname, Msgid) (Msgid) -# define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) while (0) /* nothing */ -# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ # define _(String) (String) # define N_(String) (String) #endif diff --git a/gdb/main.c b/gdb/main.c index 23d4ca046ae..2ea9466d38f 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -501,8 +501,10 @@ captured_main (void *data) #if defined (HAVE_SETLOCALE) setlocale (LC_CTYPE, ""); #endif +#ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); +#endif bfd_init (); notice_open_fds (); -- 2.30.2