FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Zack Weinberg 2001-10-21 16:29:13 +00:00
parent 957569499b
commit 77c068446e
9 changed files with 126 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gcc/ChangeLog
View file

@ -1,3 +1,10 @@
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> 2001-10-21 Neil Booth <neil@daikokuya.demon.co.uk>
* cpphash.h (struct cpp_buffer): Delete read_ahead and extra_char. * 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> 2001-10-19 Catherine Moore <clm@redhat.com>
* config/stormy16/stormy-abi: Updates to varargs descriptions. * config/stormy16/stormy-abi: Updates to varargs descriptions.
* config/stormy16/stormy16.c (stormy16_build_va_list): Reverse * config/stormy16/stormy16.c (stormy16_build_va_list): Reverse
base and count fields. base and count fields.
(stormy16_expand_builtin_va_start): last_reg_count changed to (stormy16_expand_builtin_va_start): last_reg_count changed to
size_of_reg_args. Use count + size in first comparison. size_of_reg_args. Use count + size in first comparison.
Fri Oct 19 15:24:39 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> 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> 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 * config/stormy16/stormy16.c (stormy16_split_move): Make
sure that REG_INC notes are present for auto_inc operands. sure that REG_INC notes are present for auto_inc operands.
2001-10-19 Andreas Jaeger <aj@suse.de> 2001-10-19 Andreas Jaeger <aj@suse.de>
* configure: Regenerated. * configure: Regenerated.
* configure.in: Add x86_64 to switch statements. * configure.in: Add x86_64 to switch statements.
2001-10-18 Richard Henderson <rth@redhat.com> 2001-10-18 Richard Henderson <rth@redhat.com>

3
gcc/Makefile.in
View file

@ -335,6 +335,7 @@ USE_NLS = @USE_NLS@
# Internationalization library. # Internationalization library.
INTLLIBS = @INTLLIBS@ INTLLIBS = @INTLLIBS@
INTLDEPS = @INTLDEPS@
# Character encoding conversion library. # Character encoding conversion library.
LIBICONV = @LIBICONV@ 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 # Dependency on obstack or whatever library facilities
# are not installed in the system libraries. # are not installed in the system libraries.
# We don't use USE_* because backquote expansion doesn't work in deps. # 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 # Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC. # even if we are cross-building GCC.

4
gcc/aclocal.m4 vendored
View file

@ -1381,7 +1381,9 @@ AC_DEFUN([AM_WITH_NLS],
BUILD_INCLUDED_LIBINTL=no BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no
dnl GCC LOCAL: Separate concept of link command line from dependencies.
INTLLIBS= INTLLIBS=
INTLDEPS=
dnl If we use NLS figure out what method dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then if test "$USE_NLS" = "yes"; then
@ -1487,6 +1489,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
USE_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo CATOBJEXT=.gmo
INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" 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/ $//'` LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi fi
@ -1605,6 +1608,7 @@ changequote([,])dnl
AC_SUBST(CATOBJEXT) AC_SUBST(CATOBJEXT)
AC_SUBST(GMOFILES) AC_SUBST(GMOFILES)
AC_SUBST(INTLLIBS) AC_SUBST(INTLLIBS)
AC_SUBST(INTLDEPS)
AC_SUBST(INTLOBJS) AC_SUBST(INTLOBJS)
AC_SUBST(POFILES) AC_SUBST(POFILES)
AC_SUBST(POSUB) AC_SUBST(POSUB)

96
gcc/configure vendored
View file

@ -6079,6 +6079,7 @@ fi
BUILD_INCLUDED_LIBINTL=no BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no
INTLLIBS= INTLLIBS=
INTLDEPS=
if test "$USE_NLS" = "yes"; then if test "$USE_NLS" = "yes"; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -6086,7 +6087,7 @@ fi
EOF EOF
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
echo "configure:6090: checking whether included gettext is requested" >&5 echo "configure:6091: checking whether included gettext is requested" >&5
# Check whether --with-included-gettext or --without-included-gettext was given. # Check whether --with-included-gettext or --without-included-gettext was given.
if test "${with_included_gettext+set}" = set; then if test "${with_included_gettext+set}" = set; then
withval="$with_included_gettext" withval="$with_included_gettext"
@ -6106,17 +6107,17 @@ fi
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
echo "configure:6110: checking for libintl.h" >&5 echo "configure:6111: checking for libintl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6115 "configure" #line 6116 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <libintl.h> #include <libintl.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -6137,12 +6138,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
EOF EOF
echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
echo "configure:6141: checking for GNU gettext in libc" >&5 echo "configure:6142: checking for GNU gettext in libc" >&5
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6146 "configure" #line 6147 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <libintl.h> #include <libintl.h>
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
@ -6151,7 +6152,7 @@ bindtextdomain ("", "");
return (int) gettext ("") + _nl_msg_cat_cntr return (int) gettext ("") + _nl_msg_cat_cntr
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
gt_cv_func_gnugettext1_libc=yes gt_cv_func_gnugettext1_libc=yes
else else
@ -6167,14 +6168,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
if test "$gt_cv_func_gnugettext1_libc" != "yes"; then if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
echo "configure:6171: checking for GNU gettext in libintl" >&5 echo "configure:6172: checking for GNU gettext in libintl" >&5
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
gt_save_LIBS="$LIBS" gt_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $LIBICONV" LIBS="$LIBS -lintl $LIBICONV"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6178 "configure" #line 6179 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <libintl.h> #include <libintl.h>
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
@ -6183,7 +6184,7 @@ bindtextdomain ("", "");
return (int) gettext ("") + _nl_msg_cat_cntr return (int) gettext ("") + _nl_msg_cat_cntr
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
gt_cv_func_gnugettext1_libintl=yes gt_cv_func_gnugettext1_libintl=yes
else else
@ -6216,12 +6217,12 @@ EOF
for ac_func in dcgettext for ac_func in dcgettext
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:6220: checking for $ac_func" >&5 echo "configure:6221: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6225 "configure" #line 6226 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -6244,7 +6245,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -6273,7 +6274,7 @@ done
# Extract the first word of "msgfmt", so it can be a program name with args. # Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2 set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6277: checking for $ac_word" >&5 echo "configure:6278: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6307,7 +6308,7 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args. # Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2 set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6311: checking for $ac_word" >&5 echo "configure:6312: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6344,7 +6345,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args. # Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2 set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6348: checking for $ac_word" >&5 echo "configure:6349: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6394,7 +6395,7 @@ fi
# Extract the first word of "msgfmt", so it can be a program name with args. # Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2 set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6398: checking for $ac_word" >&5 echo "configure:6399: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6428,7 +6429,7 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args. # Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2 set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6432: checking for $ac_word" >&5 echo "configure:6433: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6464,7 +6465,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args. # Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2 set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6468: checking for $ac_word" >&5 echo "configure:6469: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6500,6 +6501,7 @@ fi
USE_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo CATOBJEXT=.gmo
INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
INTLDEPS="\$(top_builddir)/intl/libintl.a"
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi fi
@ -6535,7 +6537,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6539: checking for $ac_word" >&5 echo "configure:6541: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -6568,7 +6570,7 @@ done
ac_verc_fail=yes ac_verc_fail=yes
else else
echo $ac_n "checking version of bison""... $ac_c" 1>&6 echo $ac_n "checking version of bison""... $ac_c" 1>&6
echo "configure:6572: checking version of bison" >&5 echo "configure:6574: checking version of bison" >&5
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@ -6596,6 +6598,7 @@ echo "configure:6572: checking version of bison" >&5
if test $USE_INCLUDED_LIBINTL = yes; then if test $USE_INCLUDED_LIBINTL = yes; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define USE_INCLUDED_LIBINTL 1 #define USE_INCLUDED_LIBINTL 1
@ -6621,7 +6624,7 @@ EOF
LINGUAS= LINGUAS=
else else
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
echo "configure:6625: checking for catalogs to be installed" >&5 echo "configure:6628: checking for catalogs to be installed" >&5
NEW_LINGUAS= NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do for presentlang in $ALL_LINGUAS; do
useit=no useit=no
@ -6672,7 +6675,7 @@ fi
case $host_os in case $host_os in
win32 | pe | cygwin* | mingw32* | uwin*) win32 | pe | cygwin* | mingw32* | uwin*)
echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
echo "configure:6676: checking whether windows registry support is requested" >&5 echo "configure:6679: checking whether windows registry support is requested" >&5
if test "x$enable_win32_registry" != xno; then if test "x$enable_win32_registry" != xno; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define ENABLE_WIN32_REGISTRY 1 #define ENABLE_WIN32_REGISTRY 1
@ -6681,14 +6684,14 @@ EOF
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6 echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6
echo "configure:6685: checking for library containing RegOpenKeyExA" >&5 echo "configure:6688: checking for library containing RegOpenKeyExA" >&5
if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_func_search_save_LIBS="$LIBS" ac_func_search_save_LIBS="$LIBS"
ac_cv_search_RegOpenKeyExA="no" ac_cv_search_RegOpenKeyExA="no"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6692 "configure" #line 6695 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -6699,7 +6702,7 @@ int main() {
RegOpenKeyExA() RegOpenKeyExA()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_search_RegOpenKeyExA="none required" ac_cv_search_RegOpenKeyExA="none required"
else else
@ -6710,7 +6713,7 @@ rm -f conftest*
test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do
LIBS="-l$i $ac_func_search_save_LIBS" LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6714 "configure" #line 6717 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -6721,7 +6724,7 @@ int main() {
RegOpenKeyExA() RegOpenKeyExA()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_search_RegOpenKeyExA="-l$i" ac_cv_search_RegOpenKeyExA="-l$i"
break break
@ -6763,7 +6766,7 @@ esac
if test "x$enable_win32_registry" != xno; then if test "x$enable_win32_registry" != xno; then
echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
echo "configure:6767: checking registry key on windows hosts" >&5 echo "configure:6770: checking registry key on windows hosts" >&5
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key" #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
EOF EOF
@ -6946,7 +6949,7 @@ fi
# Figure out what assembler we will be using. # Figure out what assembler we will be using.
echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
echo "configure:6950: checking what assembler to use" >&5 echo "configure:6953: checking what assembler to use" >&5
gcc_cv_as= gcc_cv_as=
gcc_cv_gas_major_version= gcc_cv_gas_major_version=
gcc_cv_gas_minor_version= gcc_cv_gas_minor_version=
@ -7032,7 +7035,7 @@ fi
# Figure out what nm we will be using. # Figure out what nm we will be using.
echo $ac_n "checking what nm to use""... $ac_c" 1>&6 echo $ac_n "checking what nm to use""... $ac_c" 1>&6
echo "configure:7036: checking what nm to use" >&5 echo "configure:7039: checking what nm to use" >&5
if test -x nm$host_exeext; then if test -x nm$host_exeext; then
gcc_cv_nm=./nm$host_exeext gcc_cv_nm=./nm$host_exeext
elif test x$host = x$target; then elif test x$host = x$target; then
@ -7043,7 +7046,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6
# Figure out what assembler alignment features are present. # Figure out what assembler alignment features are present.
echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
echo "configure:7047: checking assembler alignment features" >&5 echo "configure:7050: checking assembler alignment features" >&5
gcc_cv_as_alignment_features=none gcc_cv_as_alignment_features=none
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
# Gas version 2.6 and later support for .balign and .p2align. # Gas version 2.6 and later support for .balign and .p2align.
@ -7091,7 +7094,7 @@ fi
echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
echo "configure:7095: checking assembler subsection support" >&5 echo "configure:7098: checking assembler subsection support" >&5
gcc_cv_as_subsections=no gcc_cv_as_subsections=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@ -7131,7 +7134,7 @@ fi
echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo "$ac_t""$gcc_cv_as_subsections" 1>&6
echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
echo "configure:7135: checking assembler weak support" >&5 echo "configure:7138: checking assembler weak support" >&5
gcc_cv_as_weak=no gcc_cv_as_weak=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then
@ -7154,7 +7157,7 @@ fi
echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo "$ac_t""$gcc_cv_as_weak" 1>&6
echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
echo "configure:7158: checking assembler hidden support" >&5 echo "configure:7161: checking assembler hidden support" >&5
gcc_cv_as_hidden=no gcc_cv_as_hidden=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@ -7178,7 +7181,7 @@ fi
echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo "$ac_t""$gcc_cv_as_hidden" 1>&6
echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6
echo "configure:7182: checking assembler leb128 support" >&5 echo "configure:7185: checking assembler leb128 support" >&5
gcc_cv_as_leb128=no gcc_cv_as_leb128=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@ -7223,7 +7226,7 @@ fi
echo "$ac_t""$gcc_cv_as_leb128" 1>&6 echo "$ac_t""$gcc_cv_as_leb128" 1>&6
echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6 echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6
echo "configure:7227: checking assembler eh_frame optimization" >&5 echo "configure:7230: checking assembler eh_frame optimization" >&5
gcc_cv_as_eh_frame=no gcc_cv_as_eh_frame=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@ -7304,7 +7307,7 @@ fi
echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6 echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6
echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6 echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6
echo "configure:7308: checking assembler section merging support" >&5 echo "configure:7311: checking assembler section merging support" >&5
gcc_cv_as_shf_merge=no gcc_cv_as_shf_merge=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@ -7329,7 +7332,7 @@ echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
case "$target" in case "$target" in
sparc*-*-*) sparc*-*-*)
echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
echo "configure:7333: checking assembler .register pseudo-op support" >&5 echo "configure:7336: checking assembler .register pseudo-op support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -7357,7 +7360,7 @@ EOF
fi fi
echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
echo "configure:7361: checking assembler supports -relax" >&5 echo "configure:7364: checking assembler supports -relax" >&5
if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -7387,7 +7390,7 @@ EOF
case "$tm_file" in case "$tm_file" in
*64*) *64*)
echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6 echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
echo "configure:7391: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 echo "configure:7394: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -7432,7 +7435,7 @@ EOF
if test "x$gcc_cv_as_flags64" != xno; then if test "x$gcc_cv_as_flags64" != xno; then
echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
echo "configure:7436: checking for assembler offsetable %lo() support" >&5 echo "configure:7439: checking for assembler offsetable %lo() support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -7472,7 +7475,7 @@ EOF
i[34567]86-*-* | x86_64-*-*) i[34567]86-*-* | x86_64-*-*)
echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
echo "configure:7476: checking assembler instructions" >&5 echo "configure:7479: checking assembler instructions" >&5
gcc_cv_as_instructions= gcc_cv_as_instructions=
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then
@ -7499,7 +7502,7 @@ EOF
echo "$ac_t""$gcc_cv_as_instructions" 1>&6 echo "$ac_t""$gcc_cv_as_instructions" 1>&6
echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6 echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6
echo "configure:7503: checking assembler GOTOFF in data directives" >&5 echo "configure:7506: checking assembler GOTOFF in data directives" >&5
gcc_cv_as_gotoff_in_data=no gcc_cv_as_gotoff_in_data=no
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x
then then
@ -7529,7 +7532,7 @@ EOF
esac esac
echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
echo "configure:7533: checking assembler dwarf2 debug_line support" >&5 echo "configure:7536: checking assembler dwarf2 debug_line support" >&5
gcc_cv_as_dwarf2_debug_line=no gcc_cv_as_dwarf2_debug_line=no
# ??? Not all targets support dwarf2 debug_line, even within a version # ??? Not all targets support dwarf2 debug_line, even within a version
# of gas. Moreover, we need to emit a valid instruction to trigger any # of gas. Moreover, we need to emit a valid instruction to trigger any
@ -7721,7 +7724,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:7725: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo "configure:7728: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode" enableval="$enable_maintainer_mode"
@ -8264,6 +8267,7 @@ s%@CATALOGS@%$CATALOGS%g
s%@CATOBJEXT@%$CATOBJEXT%g s%@CATOBJEXT@%$CATOBJEXT%g
s%@GMOFILES@%$GMOFILES%g s%@GMOFILES@%$GMOFILES%g
s%@INTLLIBS@%$INTLLIBS%g s%@INTLLIBS@%$INTLLIBS%g
s%@INTLDEPS@%$INTLDEPS%g
s%@INTLOBJS@%$INTLOBJS%g s%@INTLOBJS@%$INTLOBJS%g
s%@POFILES@%$POFILES%g s%@POFILES@%$POFILES%g
s%@POSUB@%$POSUB%g s%@POSUB@%$POSUB%g

46
gcc/intl/ChangeLog
View file

@ -1,3 +1,15 @@
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> 2001-10-19 Zack Weinberg <zack@codesourcery.com>
* Makefile.in: Don't copy libgnuintl.h anywhere. * Makefile.in: Don't copy libgnuintl.h anywhere.
@ -52,7 +64,7 @@
in call to _nl_normalize_codeset. in call to _nl_normalize_codeset.
* l10nflist.c: Define _GNU_SOURCE before any system header is * l10nflist.c: Define _GNU_SOURCE before any system header is
included. included.
1998-04-29 Ulrich Drepper <drepper@cygnus.com> 1998-04-29 Ulrich Drepper <drepper@cygnus.com>
* intl/localealias.c (read_alias_file): Use unsigned char for * 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> Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in (install): Split goal. Now depend on install-exec * 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-exec, install-data): New goals. Created from former
install goal. install goal.
Reported by Karl Berry. 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> Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in (MKINSTALLDIRS): New variable. Path to * Makefile.in (MKINSTALLDIRS): New variable. Path to
mkinstalldirs script. mkinstalldirs script.
(install): use MKINSTALLDIRS variable or if the script is not present (install): use MKINSTALLDIRS variable or if the script is not present
try to find it in the $top_scrdir). 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. result to __result to prevent name clash.
* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to * 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 * intlh.inst.in, libgettext.h: Move declaration of
`_nl_msg_cat_cntr' outside __extension__ block to prevent warning `_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. Patch by Eric Backus.
* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
malloc. malloc.
(read_alias_file): Rename varriabe alloca_list to block_list as the (read_alias_file): Rename varriabe alloca_list to block_list as the
macro calls assume. macro calls assume.
Patch by Eric Backus. Patch by Eric Backus.
@ -298,10 +310,10 @@ Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com>
Reported by Roland McGrath. Reported by Roland McGrath.
* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not * 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 * Makefile.in (install): intlh.inst comes from local dir, not
$(srcdir). $(srcdir).
* Makefile.in (intlh.inst): Special handling of this goal. If * Makefile.in (intlh.inst): Special handling of this goal. If
used in gettext, this is really a rul to construct this file. 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. * libintl.inst: Renamed to intlh.inst.in.
* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
because gcc has __buitlin_alloca. because gcc has __buitlin_alloca.
Reported by Roland McGrath. Reported by Roland McGrath.
Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile.in (installcheck): New goal to fulfill needs of * Makefile.in (installcheck): New goal to fulfill needs of
automake's distcheck. automake's distcheck.
* Makefile.in (install): Reorder commands so that VERSION is * Makefile.in (install): Reorder commands so that VERSION is
found. found.
* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
@datadir@/gettext. @datadir@/gettext.
(COMSRCS): Add l10nfile.c. (COMSRCS): Add l10nfile.c.
(OBJECTS): Add l10nfile.o. (OBJECTS): Add l10nfile.o.
(DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). (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> Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com>
* loadmsgcat.c (_nl_load_domain): Parameter is now comes from * 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> 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. code. Use new l10nfile handling.
* localealias.c [!HAVE_ALLOCA]: Add code for handling missing * localealias.c [!HAVE_ALLOCA]: Add code for handling missing
alloca code. alloca code.
* l10nflist.c: Initial revision. * 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> Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware>
* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing * 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> 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> Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware>
* gettextP.h [loaded_domain]: Array `successor' must now contain up * 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. * 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> Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com>
* localealias.c (alias_compare): Increment string pointers in loop * 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> 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> Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware>
* Makefile.in (Makefile): Explicitly use $(SHELL) for running * 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> Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>

7
gcc/intl/dcigettext.c
View file

@ -123,7 +123,8 @@ extern int errno;
#ifdef _LIBC #ifdef _LIBC
/* Rename the non ANSI C functions. This is required by the standard /* Rename the non ANSI C functions. This is required by the standard
because some ANSI C functions will require linking with this object 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 # define getcwd __getcwd
# ifndef stpcpy # ifndef stpcpy
# define stpcpy __stpcpy # define stpcpy __stpcpy
@ -133,8 +134,10 @@ extern int errno;
# if !defined HAVE_GETCWD # if !defined HAVE_GETCWD
char *getwd (); char *getwd ();
# define getcwd(buf, max) getwd (buf) # define getcwd(buf, max) getwd (buf)
# elif !defined HAVE_DECL_GETCWD # else
# if !defined HAVE_DECL_GETCWD
char *getcwd (); char *getcwd ();
# endif
# endif # endif
# ifndef HAVE_STPCPY # ifndef HAVE_STPCPY
static char *stpcpy PARAMS ((char *dest, const char *src)); static char *stpcpy PARAMS ((char *dest, const char *src));

17
gcc/intl/gettextP.h
View file

@ -63,6 +63,8 @@
# include <byteswap.h> # include <byteswap.h>
# define SWAP(i) bswap_32 (i) # define SWAP(i) bswap_32 (i)
#else #else
/* GCC LOCAL: Prototype first to avoid warnings. */
static inline nls_uint32 SWAP PARAMS ((nls_uint32));
static inline nls_uint32 static inline nls_uint32
SWAP (i) SWAP (i)
nls_uint32 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 /* We want to allocate a string at the end of the struct. But ISO C
doesn't allow zero sized arrays. */ doesn't allow zero sized arrays.
#ifdef __GNUC__ GCC LOCAL: Always use 1, to avoid warnings. */
# define ZERO 0 /*#ifdef __GNUC__*/
#else /*# define ZERO 0*/
/*#else*/
# define ZERO 1 # define ZERO 1
#endif /*#endif*/
/* A set of settings bound to a message domain. Used to store settings /* A set of settings bound to a message domain. Used to store settings
from bindtextdomain() and bind_textdomain_codeset(). */ 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)) const char *msgid, size_t *lengthp))
internal_function; 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 #ifdef _LIBC
extern char *__gettext PARAMS ((const char *__msgid)); extern char *__gettext PARAMS ((const char *__msgid));
extern char *__dgettext PARAMS ((const char *__domainname, extern char *__dgettext PARAMS ((const char *__domainname,

10
gcc/intl/loadmsgcat.c
View file

@ -136,13 +136,14 @@ int _nl_msg_cat_cntr;
|| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
/* These structs are the constant expression for the germanic plural /* These structs are the constant expression for the germanic plural
form determination. It represents the expression "n != 1". */ form determination. It represents the expression "n != 1".
static const struct expression plvar = GCC LOCAL: Use __extension__ to suppress -Wtraditional warnings. */
__extension__ static const struct expression plvar =
{ {
.nargs = 0, .nargs = 0,
.operation = var, .operation = var,
}; };
static const struct expression plone = __extension__ static const struct expression plone =
{ {
.nargs = 0, .nargs = 0,
.operation = num, .operation = num,
@ -151,7 +152,7 @@ static const struct expression plone =
.num = 1 .num = 1
} }
}; };
static struct expression germanic_plural = __extension__ static struct expression germanic_plural =
{ {
.nargs = 2, .nargs = 2,
.operation = not_equal, .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; outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
# else # else
# if HAVE_ICONV # if HAVE_ICONV
extern const char *locale_charset (void);
outcharset = locale_charset (); outcharset = locale_charset ();
# endif # endif
# endif # endif

9
gcc/intl/localcharset.c
View file

@ -77,6 +77,9 @@
ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
static const char * volatile charset_aliases; 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. */ /* Return a pointer to the contents of the charset.alias file. */
static const char * static const char *
get_charset_aliases () get_charset_aliases ()
@ -194,11 +197,9 @@ get_charset_aliases ()
into one of the canonical names listed in config.charset. into one of the canonical names listed in config.charset.
The result must not be freed; it is statically allocated. The result must not be freed; it is statically allocated.
If the canonical name cannot be determined, the result is a non-canonical 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 * const char *
locale_charset () locale_charset ()
{ {