Skip to content

R
riscv-gcc-1
Commit 77c06844 by Zack Weinberg
Options

aclocal.m4 (AM_WITH_NLS): Also create and substitute INTLDEPS variable, which… 

aclocal.m4 (AM_WITH_NLS): Also create and substitute INTLDEPS variable, which does not include $LIBICONV.

	* aclocal.m4 (AM_WITH_NLS): Also create and substitute
	INTLDEPS variable, which does not include $LIBICONV.
	* Makefile.in: Use INTLDEPS in LIBDEPS.
	* configure: Regenerate.

intl:
	* dcigettext.c: Don't use #elif.
	* gettextP.h: Prototype nls_uint32 and locale_charset here.
	Always define ZERO to 1 to avoid warnings (ZERO is used in
	flexible-array-member declarations).
	* loadmsgcat.c: Apply __extension__ to structure definitions
	using C99 designated initializer syntax.
	Do not prototype locale_charset here.
	* localcharset.c: Prototype get_charset_aliases before use.
	Get rid of STATIC nonsense.

From-SVN: r46394
parent 95756949
Showing with 76 additions and 41 deletions
gcc/ChangeLog
2001-10-21 Zack Weinberg <zack@codesourcery.com>
* aclocal.m4 (AM_WITH_NLS): Also create and substitute
INTLDEPS variable, which does not include $LIBICONV.
* Makefile.in: Use INTLDEPS in LIBDEPS.
* configure: Regenerate.
2001-10-21 Neil Booth <neil@daikokuya.demon.co.uk>
* cpphash.h (struct cpp_buffer): Delete read_ahead and extra_char.
......@@ -172,11 +179,11 @@ Sat Oct 20 12:01:07 CEST 2001 Jan Hubicka <jh@suse.cz>
2001-10-19 Catherine Moore <clm@redhat.com>
* config/stormy16/stormy-abi: Updates to varargs descriptions.
* config/stormy16/stormy16.c (stormy16_build_va_list): Reverse
base and count fields.
(stormy16_expand_builtin_va_start): last_reg_count changed to
size_of_reg_args. Use count + size in first comparison.
* config/stormy16/stormy-abi: Updates to varargs descriptions.
* config/stormy16/stormy16.c (stormy16_build_va_list): Reverse
base and count fields.
(stormy16_expand_builtin_va_start): last_reg_count changed to
size_of_reg_args. Use count + size in first comparison.
Fri Oct 19 15:24:39 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
......@@ -267,14 +274,14 @@ Fri Oct 19 15:24:39 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
2001-10-19 Catherine Moore <clm@redhat.com>
* config/stormy16/stormy16.h (ASM_COMMENT_START): Define.
* config/stormy16/stormy16.h (ASM_COMMENT_START): Define.
* config/stormy16/stormy16.c (stormy16_split_move): Make
sure that REG_INC notes are present for auto_inc operands.
2001-10-19 Andreas Jaeger <aj@suse.de>
* configure: Regenerated.
* configure: Regenerated.
* configure.in: Add x86_64 to switch statements.
2001-10-18 Richard Henderson <rth@redhat.com>
......
gcc/Makefile.in
......@@ -335,6 +335,7 @@ USE_NLS = @USE_NLS@
# Internationalization library.
INTLLIBS = @INTLLIBS@
INTLDEPS = @INTLDEPS@
# Character encoding conversion library.
LIBICONV = @LIBICONV@
......@@ -615,7 +616,7 @@ USE_HOST_STRSTR= ` case "${HOST_STRSTR}" in ?*) echo ${HOST_PREFIX}${HOST_STRSTR
# Dependency on obstack or whatever library facilities
# are not installed in the system libraries.
# We don't use USE_* because backquote expansion doesn't work in deps.
LIBDEPS= $(INTLLIBS) $(OBSTACK) $(VFPRINTF) $(DOPRINT) $(STRSTR)
LIBDEPS= $(INTLDEPS) $(OBSTACK) $(VFPRINTF) $(DOPRINT) $(STRSTR)
# Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC.
......
gcc/aclocal.m4
......@@ -1381,7 +1381,9 @@ AC_DEFUN([AM_WITH_NLS],
BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no
dnl GCC LOCAL: Separate concept of link command line from dependencies.
INTLLIBS=
INTLDEPS=
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
......@@ -1487,6 +1489,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo
INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
INTLDEPS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a"
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
......@@ -1605,6 +1608,7 @@ changequote([,])dnl
AC_SUBST(CATOBJEXT)
AC_SUBST(GMOFILES)
AC_SUBST(INTLLIBS)
AC_SUBST(INTLDEPS)
AC_SUBST(INTLOBJS)
AC_SUBST(POFILES)
AC_SUBST(POSUB)
......
gcc/intl/ChangeLog
2001-10-21 Zack Weinberg <zack@codesourcery.com>
* dcigettext.c: Don't use #elif.
* gettextP.h: Prototype nls_uint32 and locale_charset here.
Always define ZERO to 1 to avoid warnings (ZERO is used in
flexible-array-member declarations).
* loadmsgcat.c: Apply __extension__ to structure definitions
using C99 designated initializer syntax.
Do not prototype locale_charset here.
* localcharset.c: Prototype get_charset_aliases before use.
Get rid of STATIC nonsense.
2001-10-19 Zack Weinberg <zack@codesourcery.com>
* Makefile.in: Don't copy libgnuintl.h anywhere.
......@@ -52,7 +64,7 @@
in call to _nl_normalize_codeset.
* l10nflist.c: Define _GNU_SOURCE before any system header is
included.
1998-04-29 Ulrich Drepper <drepper@cygnus.com>
* intl/localealias.c (read_alias_file): Use unsigned char for
......@@ -228,7 +240,7 @@ Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com>
Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in (install): Split goal. Now depend on install-exec
and install-data.
and install-data.
(install-exec, install-data): New goals. Created from former
install goal.
Reported by Karl Berry.
......@@ -236,7 +248,7 @@ Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com>
Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in (MKINSTALLDIRS): New variable. Path to
mkinstalldirs script.
mkinstalldirs script.
(install): use MKINSTALLDIRS variable or if the script is not present
try to find it in the $top_scrdir).
......@@ -264,7 +276,7 @@ Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com>
result to __result to prevent name clash.
* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
get prototype for stpcpy and strcasecmp.
get prototype for stpcpy and strcasecmp.
* intlh.inst.in, libgettext.h: Move declaration of
`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
......@@ -289,7 +301,7 @@ Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com>
Patch by Eric Backus.
* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
malloc.
malloc.
(read_alias_file): Rename varriabe alloca_list to block_list as the
macro calls assume.
Patch by Eric Backus.
......@@ -298,10 +310,10 @@ Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com>
Reported by Roland McGrath.
* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
all-@USE_NLS@.
all-@USE_NLS@.
* Makefile.in (install): intlh.inst comes from local dir, not
$(srcdir).
$(srcdir).
* Makefile.in (intlh.inst): Special handling of this goal. If
used in gettext, this is really a rul to construct this file. If
......@@ -328,19 +340,19 @@ Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com>
* libintl.inst: Renamed to intlh.inst.in.
* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
because gcc has __buitlin_alloca.
because gcc has __buitlin_alloca.
Reported by Roland McGrath.
Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in (installcheck): New goal to fulfill needs of
automake's distcheck.
automake's distcheck.
* Makefile.in (install): Reorder commands so that VERSION is
found.
found.
* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
@datadir@/gettext.
@datadir@/gettext.
(COMSRCS): Add l10nfile.c.
(OBJECTS): Add l10nfile.o.
(DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common).
......@@ -356,7 +368,7 @@ Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com>
Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com>
* loadmsgcat.c (_nl_load_domain): Parameter is now comes from
find_l10nfile.
find_l10nfile.
Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com>
......@@ -366,7 +378,7 @@ Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com>
code. Use new l10nfile handling.
* localealias.c [!HAVE_ALLOCA]: Add code for handling missing
alloca code.
alloca code.
* l10nflist.c: Initial revision.
......@@ -385,7 +397,7 @@ Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware>
Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware>
* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
with external declaration.
with external declaration.
Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware>
......@@ -394,7 +406,7 @@ Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware>
Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware>
* gettextP.h [loaded_domain]: Array `successor' must now contain up
to 63 elements (because of codeset name normalization).
to 63 elements (because of codeset name normalization).
* finddomain.c: Implement codeset name normalization.
......@@ -407,7 +419,7 @@ Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware>
Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com>
* localealias.c (alias_compare): Increment string pointers in loop
of strcasecmp replacement.
of strcasecmp replacement.
Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware>
......@@ -422,7 +434,7 @@ Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware>
Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (Makefile): Explicitly use $(SHELL) for running
shell scripts.
shell scripts.
Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
......
gcc/intl/dcigettext.c
......@@ -123,7 +123,8 @@ extern int errno;
#ifdef _LIBC
/* Rename the non ANSI C functions. This is required by the standard
because some ANSI C functions will require linking with this object
file and the name space must not be polluted. */
file and the name space must not be polluted.
GCC LOCAL: Don't use #elif. */
# define getcwd __getcwd
# ifndef stpcpy
# define stpcpy __stpcpy
......@@ -133,8 +134,10 @@ extern int errno;
# if !defined HAVE_GETCWD
char *getwd ();
# define getcwd(buf, max) getwd (buf)
# elif !defined HAVE_DECL_GETCWD
# else
# if !defined HAVE_DECL_GETCWD
char *getcwd ();
# endif
# endif
# ifndef HAVE_STPCPY
static char *stpcpy PARAMS ((char *dest, const char *src));
......
gcc/intl/gettextP.h
......@@ -63,6 +63,8 @@
# include <byteswap.h>
# define SWAP(i) bswap_32 (i)
#else
/* GCC LOCAL: Prototype first to avoid warnings. */
static inline nls_uint32 SWAP PARAMS ((nls_uint32));
static inline nls_uint32
SWAP (i)
nls_uint32 i;
......@@ -144,12 +146,13 @@ struct loaded_domain
};
/* We want to allocate a string at the end of the struct. But ISO C
doesn't allow zero sized arrays. */
#ifdef __GNUC__
# define ZERO 0
#else
doesn't allow zero sized arrays.
GCC LOCAL: Always use 1, to avoid warnings. */
/*#ifdef __GNUC__*/
/*# define ZERO 0*/
/*#else*/
# define ZERO 1
#endif
/*#endif*/
/* A set of settings bound to a message domain. Used to store settings
from bindtextdomain() and bind_textdomain_codeset(). */
......@@ -189,6 +192,10 @@ char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
const char *msgid, size_t *lengthp))
internal_function;
/* GCC LOCAL: This prototype moved here from next to its
use in loadmsgcat.c. */
extern const char *locale_charset PARAMS ((void)) internal_function;
#ifdef _LIBC
extern char *__gettext PARAMS ((const char *__msgid));
extern char *__dgettext PARAMS ((const char *__domainname,
......
gcc/intl/loadmsgcat.c
......@@ -136,13 +136,14 @@ int _nl_msg_cat_cntr;
|| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
/* These structs are the constant expression for the germanic plural
form determination. It represents the expression "n != 1". */
static const struct expression plvar =
form determination. It represents the expression "n != 1".
GCC LOCAL: Use __extension__ to suppress -Wtraditional warnings. */
__extension__ static const struct expression plvar =
{
.nargs = 0,
.operation = var,
};
static const struct expression plone =
__extension__ static const struct expression plone =
{
.nargs = 0,
.operation = num,
......@@ -151,7 +152,7 @@ static const struct expression plone =
.num = 1
}
};
static struct expression germanic_plural =
__extension__ static struct expression germanic_plural =
{
.nargs = 2,
.operation = not_equal,
......@@ -271,7 +272,6 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
# else
# if HAVE_ICONV
extern const char *locale_charset (void);
outcharset = locale_charset ();
# endif
# endif
......
gcc/intl/localcharset.c
......@@ -77,6 +77,9 @@
ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
static const char * volatile charset_aliases;
/* GCC LOCAL: Static function prototypes. */
static const char *get_charset_aliases PARAMS ((void));
/* Return a pointer to the contents of the charset.alias file. */
static const char *
get_charset_aliases ()
......@@ -194,11 +197,9 @@ get_charset_aliases ()
into one of the canonical names listed in config.charset.
The result must not be freed; it is statically allocated.
If the canonical name cannot be determined, the result is a non-canonical
name. */
name.
GCC LOCAL: Get rid of STATIC nonsense. */
#ifdef STATIC
STATIC
#endif
const char *
locale_charset ()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment