diff options
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/bucomm.h | 12 | ||||
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/asintl.h | 11 | ||||
| -rw-r--r-- | gprof/ChangeLog | 5 | ||||
| -rw-r--r-- | gprof/gprof.c | 2 | ||||
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ld.h | 36 |
8 files changed, 79 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 7f7a7f4..d98b20e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Matthias Kurz <mk@baerlap.north.de> + + * bucomm.h: Prevent the inclusion of <libintl.h> from the Solaris + version of <locale.h> when ENABLE_NLS is not defined. + 2005-09-26 Mark Mitchell <mark@codesourcery.com> * BRANCHES: Mention binutils-csl-gxxpro-3_4-branch. diff --git a/binutils/bucomm.h b/binutils/bucomm.h index 0872e96..2c662c8 100644 --- a/binutils/bucomm.h +++ b/binutils/bucomm.h @@ -1,6 +1,6 @@ /* bucomm.h -- binutils common include file. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003 Free Software Foundation, Inc. + 2001, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -125,7 +125,17 @@ void *alloca (); # endif /* HAVE_ALLOCA_H */ #endif + #ifdef HAVE_LOCALE_H +# ifndef ENABLE_NLS + /* The Solaris version of locale.h always includes libintl.h. If we have + been configured with --disable-nls then ENABLE_NLS will not be defined + and the dummy definitions of bindtextdomain (et al) below will conflict + with the defintions in libintl.h. So we define these values to prevent + the bogus inclusion of libintl.h. */ +# define _LIBINTL_H +# define _LIBGETTEXT_H +# endif # include <locale.h> #endif diff --git a/gas/ChangeLog b/gas/ChangeLog index 65c7e7a..1617d2b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Matthias Kurz <mk@baerlap.north.de> + + * asintl.h: Prevent the inclusion of <libintl.h> from the Solaris + version of <locale.h> when ENABLE_NLS is not defined. + 2005-09-29 Jan Beulich <jbeulich@novell.com> * config/tc-ia64.c (parse_operands): Always parse first operand of diff --git a/gas/asintl.h b/gas/asintl.h index 3b40aa3..67ce0dd 100644 --- a/gas/asintl.h +++ b/gas/asintl.h @@ -1,5 +1,5 @@ /* asintl.h - gas-specific header for gettext code. - Copyright 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2005 Free Software Foundation, Inc. Written by Tom Tromey <tromey@cygnus.com> @@ -21,6 +21,15 @@ 02110-1301, USA. */ #ifdef HAVE_LOCALE_H +# ifndef ENABLE_NLS + /* The Solaris version of locale.h always includes libintl.h. If we have + been configured with --disable-nls then ENABLE_NLS will not be defined + and the dummy definitions of bindtextdomain (et al) below will conflict + with the defintions in libintl.h. So we define these values to prevent + the bogus inclusion of libintl.h. */ +# define _LIBINTL_H +# define _LIBGETTEXT_H +# endif # include <locale.h> #endif diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 15722f4..7140813 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Matthias Kurz <mk@baerlap.north.de> + + * gprof.c (main):Only invoke bindtextdomain() and textdomain() if + ENABLE_NLS is defined. + 2005-05-09 Nick Clifton <nickc@redhat.com> * Update the address and phone number of the FSF organization in diff --git a/gprof/gprof.c b/gprof/gprof.c index 2814309..0430df7 100644 --- a/gprof/gprof.c +++ b/gprof/gprof.c @@ -189,8 +189,10 @@ main (int argc, char **argv) #if defined (HAVE_SETLOCALE) setlocale (LC_CTYPE, ""); #endif +#ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); +#endif whoami = argv[0]; xmalloc_set_program_name (whoami); diff --git a/ld/ChangeLog b/ld/ChangeLog index 85fc35a..5b47fea 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Matthias Kurz <mk@baerlap.north.de> + + * ld.h: Prevent the inclusion of <libintl.h> from the Solaris + version of <locale.h> when ENABLE_NLS is not defined. + 2005-09-27 H.J. Lu <hongjiu.lu@intel.com> * ld.texinfo (ALIGN): Document it as forcing output section @@ -24,6 +24,42 @@ #define LD_H #ifdef HAVE_LOCALE_H +#endif +#ifndef SEEK_CUR +#define SEEK_CUR 1 +#endif +#ifndef SEEK_END +#define SEEK_END 2 +#endif + +#if defined(__GNUC__) && !defined(C_ALLOCA) +# undef alloca +# define alloca __builtin_alloca +#else +# if defined(HAVE_ALLOCA_H) && !defined(C_ALLOCA) +# include <alloca.h> +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +# if !defined (__STDC__) && !defined (__hpux) +char *alloca (); +# else +void *alloca (); +# endif /* __STDC__, __hpux */ +# endif /* alloca */ +# endif /* HAVE_ALLOCA_H */ +#endif + + +#ifdef HAVE_LOCALE_H +# ifndef ENABLE_NLS + /* The Solaris version of locale.h always includes libintl.h. If we have + been configured with --disable-nls then ENABLE_NLS will not be defined + and the dummy definitions of bindtextdomain (et al) below will conflict + with the defintions in libintl.h. So we define these values to prevent + the bogus inclusion of libintl.h. */ +# define _LIBINTL_H +# define _LIBGETTEXT_H +# endif # include <locale.h> #endif |