gdb: Use std::max and std::min throughout

  On 09/19/2016 12:47 PM, Ulrich Weigand wrote:

> 
> It seems the reason for this is a GDB header trick in common/gdb_locale.h:
> 
> #ifdef ENABLE_NLS
> ...
> #else
> # define gettext(Msgid) (Msgid)
> ...
> #endif
> 
> This will obviously cause problems if the <libintl.h> header is included
> at any point after "gdb_locale.h" (which is in turn included by "defs.h"
> via "common-defs.h", and thus by any GDB file).
> 
> Apparently in the past this newer happened.  But after your change to
> include <algorithm>, this is now triggered, since (at least the GCC 4.1
> copy of) <algorihm> includes <libintl.h> via <bits/stl_algobase.h>,
> <iosfwd>, and <bits/c++locale.h>.
> 
> Any thoughts how to fix this?

I tried a --disable-nls with both gcc 5.1 and 4.7 here, and it
doesn't trigger this.  I can't seem to find the libintl.h inclusion
you're seeing.  Sounds like that was changed at some point.

The gdb_locale.h code in question is:

#ifdef ENABLE_NLS
# include <libintl.h>
# define _(String) gettext (String)
# ifdef gettext_noop
#  define N_(String) gettext_noop (String)
# else
#  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

How about always including libintl.h, even when ENABLE_NLS:

#ifdef HAVE_LIBINTL_H
# include <libintl.h>
#endif

#ifdef ENABLE_NLS
# define _(String) gettext (String)
# ifdef gettext_noop
#  define N_(String) gettext_noop (String)
# else
#  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

I.e., something like the patch below.

From 55a19a41adba756ebb82f987a5ebbba4dcd8ee27 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Mon, 19 Sep 2016 14:29:12 +0100
Subject: [PATCH] fix libintl.h

---
 gdb/common/common.m4    | 2 +-
 gdb/common/gdb_locale.h | 5 ++++-
 gdb/config.in           | 9 ++++++---
 gdb/configure           | 2 +-
 gdb/gdbserver/config.in | 3 +++
 gdb/gdbserver/configure | 2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)
  

On 09/19/2016 02:35 PM, Pedro Alves wrote:
> # 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

Alternatively, simply remove the troublesome *gettext and *textdomain
macros, leaving only the _ and N_ ones.  I can't seem to find any
directly reference to gettext in the tree.  The textdomain calls
in main.c would need to be wrapped in #ifdef ENABLE_NLS, but
likes like that is all.

I don't have a strong preference either way.

Thanks,
Pedro Alves
  

On 09/19/2016 02:44 PM, Pedro Alves wrote:
> On 09/19/2016 02:35 PM, Pedro Alves wrote:
>> # 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
> 
> Alternatively, simply remove the troublesome *gettext and *textdomain
> macros, leaving only the _ and N_ ones.  I can't seem to find any
> directly reference to gettext in the tree.  The textdomain calls
> in main.c would need to be wrapped in #ifdef ENABLE_NLS, but
> likes like that is all.
> 
> I don't have a strong preference either way.
> 

Seems like gas/asintl.h handles this in yet another way [1].
That one seems too much of a hack to me, though.

[1] - and ld/ld.h too, see git show a70c2403.

Thanks,
Pedro Alves