From: Nick Clifton Date: Sat, 2 Sep 2000 21:35:47 +0000 (+0000) Subject: Increase minor version number (to 2.10.91) to help tools detect the new X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18e03609efaa52ca590d9de5440f3d86f8a77d0f;p=binutils-gdb.git Increase minor version number (to 2.10.91) to help tools detect the new ability to support removal of duplciate DWARF@ debug information. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6c337cd4fb3..99c7a1875bf 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2000-09-02 Nick Clifton + + * configure.in: Increase version number to 2.10.91. + * configure: Regenerate. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * po/bfd.pot: Regenerate. + 2000-09-02 Daniel Berlin * elf.c (_bfd_elf_make_section_from_shdr): Add diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index 9f18aaf7290..59f44839f6e 100644 --- a/bfd/aclocal.m4 +++ b/bfd/aclocal.m4 @@ -284,3 +284,348 @@ else $1_FALSE= fi]) +# This file is derived from `gettext.m4'. The difference is that the +# included macros assume Cygnus-style source and build trees. + +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 3 + +AC_DEFUN(CY_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define as 1 if you have gettext and don't want to use GNU gettext.]) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + dnl In the standard gettext, we would now check for catgets. + dnl However, we never want to use catgets for our releases. + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/../intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(CY_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function]) + fi + + AM_LC_MESSAGES + CY_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + if test -f $srcdir/po2tbl.sed.in; then + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/po2tbl.sed.in > po2tbl.sed + fi + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. But only do this if the po directory + dnl exists in srcdir. + if test -d $srcdir/po; then + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + fi + ]) + +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) + diff --git a/bfd/config.in b/bfd/config.in index 60338a8c9fa..7ce82fe714b 100644 --- a/bfd/config.in +++ b/bfd/config.in @@ -172,6 +172,18 @@ /* Define if you have the header file. */ #undef HAVE_VALUES_H +/* Define if you have the stpcpy function */ +#undef HAVE_STPCPY + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if NLS is requested */ +#undef ENABLE_NLS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + /* Name of package */ #undef PACKAGE diff --git a/bfd/configure b/bfd/configure index a70514871ed..19b0eb2b796 100755 --- a/bfd/configure +++ b/bfd/configure @@ -1116,7 +1116,7 @@ fi PACKAGE=bfd -VERSION=2.10.90 +VERSION=2.10.91 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/bfd/configure.in b/bfd/configure.in index a22f0146f6d..37cb13b426a 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -7,7 +7,7 @@ AC_INIT(libbfd.c) AC_CANONICAL_SYSTEM AC_ISC_POSIX -AM_INIT_AUTOMAKE(bfd, 2.10.90) +AM_INIT_AUTOMAKE(bfd, 2.10.91) dnl These must be called before AM_PROG_LIBTOOL, because it may want dnl to call AC_CHECK_PROG. diff --git a/bfd/po/bfd.pot b/bfd/po/bfd.pot index 192ad4d8463..08570f45cc5 100644 --- a/bfd/po/bfd.pot +++ b/bfd/po/bfd.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-02 13:26-0700\n" +"POT-Creation-Date: 2000-09-02 13:46-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 86d8303104c..c7cad979c19 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2000-09-02 Nick Clifton + + * configure.in: Increase version number to 2.10.91. + * configure: Regenerate. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * po/binutils.pot: Regenerate. + 2000-08-31 Alexandre Oliva * acinclude.m4: Include libtool and gettext macros from the diff --git a/binutils/Makefile.in b/binutils/Makefile.in index fa5df10b840..c3e0a53526f 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -74,6 +74,8 @@ BUILD_WINDRES = @BUILD_WINDRES@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEMANGLER_NAME = @DEMANGLER_NAME@ DLLTOOL = @DLLTOOL@ @@ -96,10 +98,12 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ NLMCONV_DEFS = @NLMCONV_DEFS@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +STRIP = @STRIP@ UNDERSCORE = @UNDERSCORE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -317,72 +321,88 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -nlmconv_OBJECTS = nlmconv.o nlmheader.o bucomm.o version.o filemode.o +nlmconv_OBJECTS = nlmconv.$(OBJEXT) nlmheader.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) nlmconv_LDADD = $(LDADD) nlmconv_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a nlmconv_LDFLAGS = -srconv_OBJECTS = srconv.o coffgrok.o bucomm.o version.o filemode.o +srconv_OBJECTS = srconv.$(OBJEXT) coffgrok.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) srconv_LDADD = $(LDADD) srconv_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a srconv_LDFLAGS = -sysdump_OBJECTS = sysdump.o bucomm.o version.o filemode.o +sysdump_OBJECTS = sysdump.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) sysdump_LDADD = $(LDADD) sysdump_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a sysdump_LDFLAGS = -coffdump_OBJECTS = coffdump.o coffgrok.o bucomm.o version.o filemode.o +coffdump_OBJECTS = coffdump.$(OBJEXT) coffgrok.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) coffdump_LDADD = $(LDADD) coffdump_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a coffdump_LDFLAGS = -dlltool_OBJECTS = dlltool.o defparse.o deflex.o bucomm.o version.o \ -filemode.o +dlltool_OBJECTS = dlltool.$(OBJEXT) defparse.$(OBJEXT) deflex.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) dlltool_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a dlltool_LDFLAGS = -windres_OBJECTS = windres.o resrc.o rescoff.o resbin.o rcparse.o \ -rclex.o winduni.o resres.o bucomm.o version.o filemode.o +windres_OBJECTS = windres.$(OBJEXT) resrc.$(OBJEXT) rescoff.$(OBJEXT) \ +resbin.$(OBJEXT) rcparse.$(OBJEXT) rclex.$(OBJEXT) winduni.$(OBJEXT) \ +resres.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) windres_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a windres_LDFLAGS = -dllwrap_OBJECTS = dllwrap.o version.o +dllwrap_OBJECTS = dllwrap.$(OBJEXT) version.$(OBJEXT) dllwrap_DEPENDENCIES = ../libiberty/libiberty.a dllwrap_LDFLAGS = -size_OBJECTS = size.o bucomm.o version.o filemode.o +size_OBJECTS = size.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) size_LDADD = $(LDADD) size_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a size_LDFLAGS = -objdump_OBJECTS = objdump.o prdbg.o rddbg.o debug.o stabs.o ieee.o \ -rdcoff.o bucomm.o version.o filemode.o +objdump_OBJECTS = objdump.$(OBJEXT) prdbg.$(OBJEXT) rddbg.$(OBJEXT) \ +debug.$(OBJEXT) stabs.$(OBJEXT) ieee.$(OBJEXT) rdcoff.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) objdump_DEPENDENCIES = ../opcodes/libopcodes.la ../bfd/libbfd.la \ ../libiberty/libiberty.a objdump_LDFLAGS = -ar_OBJECTS = arparse.o arlex.o ar.o not-ranlib.o arsup.o rename.o \ -bucomm.o version.o filemode.o +ar_OBJECTS = arparse.$(OBJEXT) arlex.$(OBJEXT) ar.$(OBJEXT) \ +not-ranlib.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) ar_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a ar_LDFLAGS = -strings_OBJECTS = strings.o bucomm.o version.o filemode.o +strings_OBJECTS = strings.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) strings_LDADD = $(LDADD) strings_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a strings_LDFLAGS = -ranlib_OBJECTS = ar.o is-ranlib.o arparse.o arlex.o arsup.o rename.o \ -bucomm.o version.o filemode.o +ranlib_OBJECTS = ar.$(OBJEXT) is-ranlib.$(OBJEXT) arparse.$(OBJEXT) \ +arlex.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) ranlib_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a ranlib_LDFLAGS = -objcopy_OBJECTS = objcopy.o not-strip.o rename.o rddbg.o debug.o \ -stabs.o ieee.o rdcoff.o wrstabs.o bucomm.o version.o filemode.o +objcopy_OBJECTS = objcopy.$(OBJEXT) not-strip.$(OBJEXT) \ +rename.$(OBJEXT) rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \ +ieee.$(OBJEXT) rdcoff.$(OBJEXT) wrstabs.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) objcopy_LDADD = $(LDADD) objcopy_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a objcopy_LDFLAGS = -addr2line_OBJECTS = addr2line.o bucomm.o version.o filemode.o +addr2line_OBJECTS = addr2line.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) addr2line_LDADD = $(LDADD) addr2line_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a addr2line_LDFLAGS = -readelf_OBJECTS = readelf.o version.o +readelf_OBJECTS = readelf.$(OBJEXT) version.$(OBJEXT) readelf_DEPENDENCIES = ../libiberty/libiberty.a readelf_LDFLAGS = -nm_new_OBJECTS = nm.o bucomm.o version.o filemode.o +nm_new_OBJECTS = nm.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) nm_new_LDADD = $(LDADD) nm_new_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a nm_new_LDFLAGS = -strip_new_OBJECTS = objcopy.o is-strip.o rename.o rddbg.o debug.o \ -stabs.o ieee.o rdcoff.o wrstabs.o bucomm.o version.o filemode.o +strip_new_OBJECTS = objcopy.$(OBJEXT) is-strip.$(OBJEXT) \ +rename.$(OBJEXT) rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \ +ieee.$(OBJEXT) rdcoff.$(OBJEXT) wrstabs.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) strip_new_LDADD = $(LDADD) strip_new_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a strip_new_LDFLAGS = @@ -414,14 +434,14 @@ configure.in deflex.c defparse.c nlmheader.c rclex.c rcparse.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(nlmconv_SOURCES) $(srconv_SOURCES) $(sysdump_SOURCES) $(coffdump_SOURCES) $(dlltool_SOURCES) $(windres_SOURCES) $(dllwrap_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(readelf_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES) $(cxxfilt_SOURCES) OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJECTS) $(dlltool_OBJECTS) $(windres_OBJECTS) $(dllwrap_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(readelf_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS) $(cxxfilt_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .dvi .info .l .lo .o .ps .s .texi .texinfo .txi .y +.SUFFIXES: .S .c .dvi .info .l .lo .o .obj .ps .s .texi .texinfo .txi .y $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -502,6 +522,11 @@ maintainer-clean-noinstPROGRAMS: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -510,6 +535,7 @@ maintainer-clean-noinstPROGRAMS: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index b468950d71e..715b5f5c25c 100644 --- a/binutils/aclocal.m4 +++ b/binutils/aclocal.m4 @@ -151,6 +151,351 @@ AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") AC_PROG_LEX AC_DECL_YYTEXT]) +# This file is derived from `gettext.m4'. The difference is that the +# included macros assume Cygnus-style source and build trees. + +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 3 + +AC_DEFUN(CY_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define as 1 if you have gettext and don't want to use GNU gettext.]) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + dnl In the standard gettext, we would now check for catgets. + dnl However, we never want to use catgets for our releases. + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/../intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(CY_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function]) + fi + + AM_LC_MESSAGES + CY_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + if test -f $srcdir/po2tbl.sed.in; then + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/po2tbl.sed.in > po2tbl.sed + fi + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. But only do this if the po directory + dnl exists in srcdir. + if test -d $srcdir/po; then + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + fi + ]) + +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) + # Add --enable-maintainer-mode option to configure. # From Jim Meyering diff --git a/binutils/config.in b/binutils/config.in index 7b70d16d867..4b309d5bb10 100644 --- a/binutils/config.in +++ b/binutils/config.in @@ -136,6 +136,18 @@ /* Define if you have the header file. */ #undef HAVE_VALUES_H +/* Define if you have the stpcpy function */ +#undef HAVE_STPCPY + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if NLS is requested */ +#undef ENABLE_NLS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + /* Name of package */ #undef PACKAGE diff --git a/binutils/configure b/binutils/configure index daacaab5e25..e1182c71c53 100755 --- a/binutils/configure +++ b/binutils/configure @@ -869,7 +869,7 @@ fi PACKAGE=binutils -VERSION=2.10.90 +VERSION=2.10.91 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/binutils/configure.in b/binutils/configure.in index 32683624c01..2bb15525367 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -5,7 +5,7 @@ AC_INIT(ar.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(binutils, 2.10.90) +AM_INIT_AUTOMAKE(binutils, 2.10.91) AM_PROG_LIBTOOL diff --git a/binutils/po/binutils.pot b/binutils/po/binutils.pot index 0dedb126b93..b350d9b2276 100644 --- a/binutils/po/binutils.pot +++ b/binutils/po/binutils.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-07-20 16:47+0200\n" +"POT-Creation-Date: 2000-09-02 13:46-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,12 +18,12 @@ msgstr "" #, c-format msgid "" "Usage: %s [-CfsHV] [-b bfdname] [--target=bfdname]\n" -" [-e executable] [--exe=executable] [--demangle]\n" +" [-e executable] [--exe=executable] [--demangle[=style]]\n" " [--basenames] [--functions] [addr addr ...]\n" msgstr "" -#: addr2line.c:83 ar.c:287 nlmconv.c:1119 objcopy.c:359 objcopy.c:391 -#: readelf.c:1831 size.c:91 strings.c:530 windres.c:737 +#: addr2line.c:83 ar.c:288 nlmconv.c:1119 objcopy.c:359 objcopy.c:391 +#: readelf.c:1837 size.c:91 strings.c:530 windres.c:737 #, c-format msgid "Report bugs to %s\n" msgstr "" @@ -33,6 +33,11 @@ msgstr "" msgid "%s: can not get addresses from archive" msgstr "" +#: addr2line.c:310 nm.c:436 objdump.c:2844 +#, c-format +msgid "unknown demangling style `%s'" +msgstr "" + #: ar.c:236 #, c-format msgid "no entry %s in archive\n" @@ -41,8 +46,8 @@ msgstr "" #: ar.c:253 #, c-format msgid "" -"Usage: %s [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file " -"file...\n" +"Usage: %s [-X32_64] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] " +"archive-file file...\n" msgstr "" #: ar.c:256 @@ -141,47 +146,51 @@ msgstr "" msgid " [V] - display the version number\n" msgstr "" -#: ar.c:282 +#: ar.c:279 +msgid " [-X32_64] - (ignored)\n" +msgstr "" + +#: ar.c:283 #, c-format msgid "Usage: %s [-vV] archive\n" msgstr "" -#: ar.c:487 +#: ar.c:499 msgid "two different operation options specified" msgstr "" -#: ar.c:562 +#: ar.c:574 #, c-format msgid "illegal option -- %c" msgstr "" -#: ar.c:594 +#: ar.c:606 msgid "no operation specified" msgstr "" -#: ar.c:597 +#: ar.c:609 msgid "`u' is only meaningful with the `r' option." msgstr "" -#: ar.c:607 +#: ar.c:619 msgid "`N' is only meaningful with the `x' and `d' options." msgstr "" -#: ar.c:610 +#: ar.c:622 msgid "Value for `N' must be positive." msgstr "" -#: ar.c:693 +#: ar.c:705 #, c-format msgid "internal error -- this option not implemented" msgstr "" -#: ar.c:812 ar.c:864 ar.c:1310 objcopy.c:1110 +#: ar.c:824 ar.c:876 ar.c:1322 objcopy.c:1110 #, c-format msgid "internal stat error on %s" msgstr "" -#: ar.c:816 +#: ar.c:828 #, c-format msgid "" "\n" @@ -189,37 +198,37 @@ msgid "" "\n" msgstr "" -#: ar.c:833 ar.c:901 +#: ar.c:845 ar.c:913 #, c-format msgid "%s is not a valid archive" msgstr "" -#: ar.c:869 +#: ar.c:881 #, c-format msgid "stat returns negative size for %s" msgstr "" -#: ar.c:996 +#: ar.c:1008 #, c-format msgid "%s is not an archive" msgstr "" -#: ar.c:1003 +#: ar.c:1015 #, c-format msgid "creating %s" msgstr "" -#: ar.c:1209 +#: ar.c:1221 #, c-format msgid "No member named `%s'\n" msgstr "" -#: ar.c:1261 +#: ar.c:1273 #, c-format msgid "no entry %s in archive %s!" msgstr "" -#: ar.c:1422 +#: ar.c:1434 #, c-format msgid "%s: no archive map to update" msgstr "" @@ -482,7 +491,7 @@ msgstr "" msgid "Excluding symbol: %s" msgstr "" -#: dlltool.c:1424 dlltool.c:1435 nm.c:920 nm.c:931 objdump.c:441 objdump.c:458 +#: dlltool.c:1424 dlltool.c:1435 nm.c:946 nm.c:957 objdump.c:443 objdump.c:460 #, c-format msgid "%s: no symbols" msgstr "" @@ -1374,8 +1383,12 @@ msgid "" " -a, --debug-syms Display debugger-only symbols\n" " -A, --print-file-name Print name of the input file before every symbol\n" " -B Same as --format=bsd\n" -" -C, --demangle Decode low-level symbol names into user-level " +" -C, --demangle[=STYLE] Decode low-level symbol names into user-level " "names\n" +" The STYLE, if specified, can be `auto' (the " +"default),\n" +" `gnu', 'lucid', 'arm', 'hp', 'edg' or " +"'gnu-new-abi'\n" " --no-demangle Do not demangle low-level symbol names\n" " -D, --dynamic Display dynamic symbols instead of normal symbols\n" " --defined-only Display only defined symbols\n" @@ -1398,30 +1411,35 @@ msgid "" " --target=BFDNAME Specify the target object format as BFDNAME\n" " -u, --undefined-only Display only undefined symbols\n" " -V, --version Display this program's version number\n" +" -X 32_64 (ignored)\n" "\n" msgstr "" -#: nm.c:325 objdump.c:272 +#: nm.c:328 objdump.c:274 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: nm.c:358 +#: nm.c:361 #, c-format msgid "%s: invalid radix" msgstr "" -#: nm.c:383 +#: nm.c:386 #, c-format msgid "%s: invalid output format" msgstr "" -#: nm.c:509 +#: nm.c:493 +msgid "Only -X 32_64 is supported" +msgstr "" + +#: nm.c:535 #, c-format msgid "data size %ld" msgstr "" -#: nm.c:1299 +#: nm.c:1325 #, c-format msgid "" "\n" @@ -1430,7 +1448,7 @@ msgid "" "\n" msgstr "" -#: nm.c:1301 +#: nm.c:1327 #, c-format msgid "" "\n" @@ -1439,14 +1457,14 @@ msgid "" "\n" msgstr "" -#: nm.c:1302 nm.c:1356 +#: nm.c:1328 nm.c:1382 msgid "" "Name Value Class Type Size Line " "Section\n" "\n" msgstr "" -#: nm.c:1353 +#: nm.c:1379 #, c-format msgid "" "\n" @@ -1455,7 +1473,7 @@ msgid "" "\n" msgstr "" -#: nm.c:1355 +#: nm.c:1381 #, c-format msgid "" "\n" @@ -1464,7 +1482,7 @@ msgid "" "\n" msgstr "" -#: nm.c:1526 +#: nm.c:1552 msgid "" "\n" "Archive index:\n" @@ -1675,59 +1693,59 @@ msgstr "" msgid "%s: don't know how to write debugging information for %s" msgstr "" -#: objcopy.c:1760 +#: objcopy.c:1761 #, c-format msgid "%s: cannot stat: %s" msgstr "" -#: objcopy.c:1810 +#: objcopy.c:1811 msgid "byte number must be non-negative" msgstr "" -#: objcopy.c:1816 +#: objcopy.c:1817 msgid "interleave must be positive" msgstr "" -#: objcopy.c:1836 objcopy.c:1844 +#: objcopy.c:1837 objcopy.c:1845 #, c-format msgid "%s both copied and removed" msgstr "" -#: objcopy.c:1913 objcopy.c:1983 objcopy.c:2084 objcopy.c:2112 +#: objcopy.c:1914 objcopy.c:1984 objcopy.c:2085 objcopy.c:2113 #, c-format msgid "bad format for %s" msgstr "" -#: objcopy.c:1916 +#: objcopy.c:1917 #, c-format msgid "cannot stat: %s: %s" msgstr "" -#: objcopy.c:1934 +#: objcopy.c:1935 #, c-format msgid "cannot open: %s: %s" msgstr "" -#: objcopy.c:1938 +#: objcopy.c:1939 #, c-format msgid "%s: fread failed" msgstr "" -#: objcopy.c:2052 +#: objcopy.c:2053 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "" -#: objcopy.c:2146 +#: objcopy.c:2147 msgid "byte number must be less than interleave" msgstr "" -#: objcopy.c:2165 +#: objcopy.c:2166 #, c-format msgid "Cannot stat: %s: %s" msgstr "" -#: objcopy.c:2205 objcopy.c:2219 +#: objcopy.c:2206 objcopy.c:2220 #, c-format msgid "%s %s%c0x%s never used" msgstr "" @@ -1794,7 +1812,11 @@ msgid "" "-S)\n" " -l, --line-numbers Include line numbers and filenames in " "output\n" -" -C, --demangle Decode mangled/processed symbol names\n" +" -C, --demangle[=STYLE] Decode mangled/processed symbol names\n" +" The STYLE, if specified, can be `auto', " +"'gnu',\n" +" 'lucid', 'arm', 'hp', 'edg', or " +"'gnu-new-abi'\n" " -w, --wide Format output for more than 80 columns\n" " -z, --disassemble-zeroes Do not skip blocks of zeroes when " "disassembling\n" @@ -1808,130 +1830,130 @@ msgid "" "\n" msgstr "" -#: objdump.c:417 +#: objdump.c:419 msgid "Sections:\n" msgstr "" -#: objdump.c:420 +#: objdump.c:422 msgid "Idx Name Size VMA LMA File off Algn" msgstr "" -#: objdump.c:422 +#: objdump.c:424 msgid "" "Idx Name Size VMA LMA File off " "Algn" msgstr "" -#: objdump.c:426 +#: objdump.c:428 msgid " Flags" msgstr "" -#: objdump.c:476 +#: objdump.c:478 #, c-format msgid "%s: not a dynamic object" msgstr "" -#: objdump.c:492 +#: objdump.c:494 #, c-format msgid "%s: No dynamic symbols" msgstr "" -#: objdump.c:1195 +#: objdump.c:1197 msgid "Out of virtual memory" msgstr "" -#: objdump.c:1604 +#: objdump.c:1606 #, c-format msgid "Can't use supplied machine %s" msgstr "" -#: objdump.c:1622 +#: objdump.c:1624 #, c-format msgid "Can't disassemble for architecture %s\n" msgstr "" -#: objdump.c:1701 +#: objdump.c:1703 #, c-format msgid "Disassembly of section %s:\n" msgstr "" -#: objdump.c:1875 +#: objdump.c:1877 #, c-format msgid "" "No %s section present\n" "\n" msgstr "" -#: objdump.c:1882 +#: objdump.c:1884 #, c-format msgid "%s has no %s section" msgstr "" -#: objdump.c:1896 +#: objdump.c:1898 #, c-format msgid "Reading %s section of %s failed: %s" msgstr "" -#: objdump.c:1908 +#: objdump.c:1910 #, c-format msgid "Reading %s section of %s failed: %s\n" msgstr "" -#: objdump.c:1951 +#: objdump.c:1953 #, c-format msgid "" "Contents of %s section:\n" "\n" msgstr "" -#: objdump.c:2051 +#: objdump.c:2053 #, c-format msgid "architecture: %s, " msgstr "" -#: objdump.c:2054 +#: objdump.c:2056 #, c-format msgid "flags 0x%08x:\n" msgstr "" -#: objdump.c:2067 +#: objdump.c:2069 msgid "" "\n" "start address 0x" msgstr "" -#: objdump.c:2099 +#: objdump.c:2101 #, c-format msgid "" "\n" "%s: file format %s\n" msgstr "" -#: objdump.c:2141 +#: objdump.c:2143 #, c-format msgid "%s: printing debugging information failed" msgstr "" -#: objdump.c:2218 +#: objdump.c:2220 #, c-format msgid "In archive %s:\n" msgstr "" -#: objdump.c:2270 +#: objdump.c:2272 #, c-format msgid "Contents of section %s:\n" msgstr "" -#: objdump.c:2783 +#: objdump.c:2785 #, c-format msgid "BFD header file version %s\n" msgstr "" -#: objdump.c:2856 +#: objdump.c:2869 msgid "unrecognized -E option" msgstr "" -#: objdump.c:2867 +#: objdump.c:2880 #, c-format msgid "unrecognized --endian type `%s'" msgstr "" @@ -1941,22 +1963,22 @@ msgstr "" msgid "parse_coff_type: Bad type code 0x%x" msgstr "" -#: rdcoff.c:423 rdcoff.c:531 rdcoff.c:729 +#: rdcoff.c:423 rdcoff.c:531 rdcoff.c:730 #, c-format msgid "bfd_coff_get_syment failed: %s" msgstr "" -#: rdcoff.c:439 rdcoff.c:749 +#: rdcoff.c:439 rdcoff.c:750 #, c-format msgid "bfd_coff_get_auxent failed: %s" msgstr "" -#: rdcoff.c:816 +#: rdcoff.c:817 #, c-format msgid "%ld: .bf without preceding function" msgstr "" -#: rdcoff.c:866 +#: rdcoff.c:867 #, c-format msgid "%ld: unexpected .ef\n" msgstr "" @@ -1970,955 +1992,955 @@ msgstr "" msgid "Last stabs entries before error:\n" msgstr "" -#: readelf.c:300 readelf.c:326 +#: readelf.c:301 readelf.c:327 #, c-format msgid "%s: Error: " msgstr "" -#: readelf.c:312 readelf.c:341 +#: readelf.c:313 readelf.c:342 #, c-format msgid "%s: Warning: " msgstr "" -#: readelf.c:391 readelf.c:529 +#: readelf.c:392 readelf.c:530 #, c-format msgid "Unhandled data length: %d\n" msgstr "" -#: readelf.c:591 +#: readelf.c:593 msgid "Don't know about relocations on this machine architecture\n" msgstr "" -#: readelf.c:631 readelf.c:660 readelf.c:692 readelf.c:720 +#: readelf.c:633 readelf.c:662 readelf.c:694 readelf.c:722 msgid "out of memory parsing relocs" msgstr "" -#: readelf.c:738 +#: readelf.c:740 msgid "" " Offset Info Type Symbol's Value Symbol's Name " "Addend\n" msgstr "" -#: readelf.c:741 +#: readelf.c:743 msgid " Offset Info Type Symbol's Value Symbol's Name\n" msgstr "" -#: readelf.c:892 readelf.c:894 +#: readelf.c:898 readelf.c:900 #, c-format msgid "unrecognised: %-7lx" msgstr "" -#: readelf.c:919 +#: readelf.c:925 #, c-format msgid "" msgstr "" -#: readelf.c:1132 +#: readelf.c:1138 #, c-format msgid "Processor Specific: %lx" msgstr "" -#: readelf.c:1151 +#: readelf.c:1157 #, c-format msgid "Operating System specific: %lx" msgstr "" -#: readelf.c:1154 readelf.c:1634 +#: readelf.c:1160 readelf.c:1640 #, c-format msgid ": %lx" msgstr "" -#: readelf.c:1168 +#: readelf.c:1174 msgid "NONE (None)" msgstr "" -#: readelf.c:1169 +#: readelf.c:1175 msgid "REL (Relocatable file)" msgstr "" -#: readelf.c:1170 +#: readelf.c:1176 msgid "EXEC (Executable file)" msgstr "" -#: readelf.c:1171 +#: readelf.c:1177 msgid "DYN (Shared object file)" msgstr "" -#: readelf.c:1172 +#: readelf.c:1178 msgid "CORE (Core file)" msgstr "" -#: readelf.c:1176 +#: readelf.c:1182 #, c-format msgid "Processor Specific: (%x)" msgstr "" -#: readelf.c:1178 +#: readelf.c:1184 #, c-format msgid "OS Specific: (%x)" msgstr "" -#: readelf.c:1180 readelf.c:1259 readelf.c:1766 +#: readelf.c:1186 readelf.c:1265 readelf.c:1772 #, c-format msgid ": %x" msgstr "" -#: readelf.c:1193 +#: readelf.c:1199 msgid "None" msgstr "" -#: readelf.c:1804 +#: readelf.c:1810 msgid "Usage: readelf {options} elf-file(s)\n" msgstr "" -#: readelf.c:1805 +#: readelf.c:1811 msgid " Options are:\n" msgstr "" -#: readelf.c:1806 +#: readelf.c:1812 msgid " -a or --all Equivalent to: -h -l -S -s -r -d -V -A -I\n" msgstr "" -#: readelf.c:1807 +#: readelf.c:1813 msgid " -h or --file-header Display the ELF file header\n" msgstr "" -#: readelf.c:1808 +#: readelf.c:1814 msgid " -l or --program-headers or --segments\n" msgstr "" -#: readelf.c:1809 +#: readelf.c:1815 msgid " Display the program headers\n" msgstr "" -#: readelf.c:1810 +#: readelf.c:1816 msgid " -S or --section-headers or --sections\n" msgstr "" -#: readelf.c:1811 +#: readelf.c:1817 msgid " Display the sections' header\n" msgstr "" -#: readelf.c:1812 +#: readelf.c:1818 msgid " -e or --headers Equivalent to: -h -l -S\n" msgstr "" -#: readelf.c:1813 +#: readelf.c:1819 msgid " -s or --syms or --symbols Display the symbol table\n" msgstr "" -#: readelf.c:1814 +#: readelf.c:1820 msgid " -n or --notes Display the core notes (if present)\n" msgstr "" -#: readelf.c:1815 +#: readelf.c:1821 msgid " -r or --relocs Display the relocations (if present)\n" msgstr "" -#: readelf.c:1816 +#: readelf.c:1822 msgid " -d or --dynamic Display the dynamic segment (if present)\n" msgstr "" -#: readelf.c:1817 +#: readelf.c:1823 msgid " -V or --version-info Display the version sections (if present)\n" msgstr "" -#: readelf.c:1818 +#: readelf.c:1824 msgid "" " -A or --arch-specific Display architecture specific information (if " "any).\n" msgstr "" -#: readelf.c:1819 +#: readelf.c:1825 msgid "" " -D or --use-dynamic Use the dynamic section info when displaying " "symbols\n" msgstr "" -#: readelf.c:1820 +#: readelf.c:1826 msgid " -x or --hex-dump=\n" msgstr "" -#: readelf.c:1821 +#: readelf.c:1827 msgid " Dump the contents of section \n" msgstr "" -#: readelf.c:1822 +#: readelf.c:1828 msgid " -w[liapr] or --debug-dump[=line,=info,=abbrev,=pubnames,=ranges]\n" msgstr "" -#: readelf.c:1823 +#: readelf.c:1829 msgid "" " Display the contents of DWARF2 debug sections\n" msgstr "" -#: readelf.c:1825 +#: readelf.c:1831 msgid " -i or --instruction-dump=\n" msgstr "" -#: readelf.c:1826 +#: readelf.c:1832 msgid "" " Disassemble the contents of section \n" msgstr "" -#: readelf.c:1828 +#: readelf.c:1834 msgid " -I or --histogram Display histogram of bucket list lengths\n" msgstr "" -#: readelf.c:1829 +#: readelf.c:1835 msgid " -v or --version Display the version number of readelf\n" msgstr "" -#: readelf.c:1830 +#: readelf.c:1836 msgid " -H or --help Display this information\n" msgstr "" -#: readelf.c:1848 +#: readelf.c:1854 msgid "Out of memory allocating dump request table." msgstr "" -#: readelf.c:1983 +#: readelf.c:1989 #, c-format msgid "Unrecognised debug option '%s'\n" msgstr "" -#: readelf.c:2008 +#: readelf.c:2014 #, c-format msgid "Invalid option '-%c'\n" msgstr "" -#: readelf.c:2021 +#: readelf.c:2027 msgid "Nothing to do.\n" msgstr "" -#: readelf.c:2034 readelf.c:2051 readelf.c:3681 +#: readelf.c:2040 readelf.c:2057 readelf.c:3687 msgid "none" msgstr "" -#: readelf.c:2035 +#: readelf.c:2041 msgid "ELF32" msgstr "" -#: readelf.c:2036 +#: readelf.c:2042 msgid "ELF64" msgstr "" -#: readelf.c:2038 readelf.c:2055 readelf.c:2083 +#: readelf.c:2044 readelf.c:2061 readelf.c:2089 #, c-format msgid "" msgstr "" -#: readelf.c:2052 +#: readelf.c:2058 msgid "2's complement, little endian" msgstr "" -#: readelf.c:2053 +#: readelf.c:2059 msgid "2's complement, big endian" msgstr "" -#: readelf.c:2068 +#: readelf.c:2074 msgid "UNIX - System V" msgstr "" -#: readelf.c:2069 +#: readelf.c:2075 msgid "UNIX - HP-UX" msgstr "" -#: readelf.c:2070 +#: readelf.c:2076 msgid "UNIX - NetBSD" msgstr "" -#: readelf.c:2071 +#: readelf.c:2077 msgid "UNIX - Linux" msgstr "" -#: readelf.c:2072 +#: readelf.c:2078 msgid "GNU/Hurd" msgstr "" -#: readelf.c:2073 +#: readelf.c:2079 msgid "UNIX - Solaris" msgstr "" -#: readelf.c:2074 +#: readelf.c:2080 msgid "UNIX - Monterey" msgstr "" -#: readelf.c:2075 +#: readelf.c:2081 msgid "UNIX - IRIX" msgstr "" -#: readelf.c:2076 +#: readelf.c:2082 msgid "UNIX - FreeBSD" msgstr "" -#: readelf.c:2077 +#: readelf.c:2083 msgid "UNIX - TRU64" msgstr "" -#: readelf.c:2078 +#: readelf.c:2084 msgid "Novell - Modesto" msgstr "" -#: readelf.c:2079 +#: readelf.c:2085 msgid "UNIX - OpenBSD" msgstr "" -#: readelf.c:2080 +#: readelf.c:2086 msgid "Standalone App" msgstr "" -#: readelf.c:2081 +#: readelf.c:2087 msgid "ARM" msgstr "" -#: readelf.c:2098 +#: readelf.c:2104 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "" -#: readelf.c:2106 +#: readelf.c:2112 msgid "ELF Header:\n" msgstr "" -#: readelf.c:2107 +#: readelf.c:2113 msgid " Magic: " msgstr "" -#: readelf.c:2111 +#: readelf.c:2117 #, c-format msgid " Class: %s\n" msgstr "" -#: readelf.c:2113 +#: readelf.c:2119 #, c-format msgid " Data: %s\n" msgstr "" -#: readelf.c:2115 +#: readelf.c:2121 #, c-format msgid " Version: %d %s\n" msgstr "" -#: readelf.c:2122 +#: readelf.c:2128 #, c-format msgid " OS/ABI: %s\n" msgstr "" -#: readelf.c:2124 +#: readelf.c:2130 #, c-format msgid " ABI Version: %d\n" msgstr "" -#: readelf.c:2126 +#: readelf.c:2132 #, c-format msgid " Type: %s\n" msgstr "" -#: readelf.c:2128 +#: readelf.c:2134 #, c-format msgid " Machine: %s\n" msgstr "" -#: readelf.c:2130 +#: readelf.c:2136 #, c-format msgid " Version: 0x%lx\n" msgstr "" -#: readelf.c:2133 +#: readelf.c:2139 msgid " Entry point address: " msgstr "" -#: readelf.c:2135 +#: readelf.c:2141 msgid "" "\n" " Start of program headers: " msgstr "" -#: readelf.c:2137 +#: readelf.c:2143 msgid "" " (bytes into file)\n" " Start of section headers: " msgstr "" -#: readelf.c:2139 +#: readelf.c:2145 msgid " (bytes into file)\n" msgstr "" -#: readelf.c:2141 +#: readelf.c:2147 #, c-format msgid " Flags: 0x%lx%s\n" msgstr "" -#: readelf.c:2144 +#: readelf.c:2150 #, c-format msgid " Size of this header: %ld (bytes)\n" msgstr "" -#: readelf.c:2146 +#: readelf.c:2152 #, c-format msgid " Size of program headers: %ld (bytes)\n" msgstr "" -#: readelf.c:2148 +#: readelf.c:2154 #, c-format msgid " Number of program headers: %ld\n" msgstr "" -#: readelf.c:2150 +#: readelf.c:2156 #, c-format msgid " Size of section headers: %ld (bytes)\n" msgstr "" -#: readelf.c:2152 +#: readelf.c:2158 #, c-format msgid " Number of section headers: %ld\n" msgstr "" -#: readelf.c:2154 +#: readelf.c:2160 #, c-format msgid " Section header string table index: %ld\n" msgstr "" -#: readelf.c:2239 +#: readelf.c:2245 msgid "" "\n" "There are no program headers in this file.\n" msgstr "" -#: readelf.c:2245 +#: readelf.c:2251 #, c-format msgid "" "\n" "Elf file type is %s\n" msgstr "" -#: readelf.c:2246 +#: readelf.c:2252 msgid "Entry point " msgstr "" -#: readelf.c:2248 +#: readelf.c:2254 #, c-format msgid "" "\n" "There are %d program headers, starting at offset " msgstr "" -#: readelf.c:2259 readelf.c:2435 readelf.c:2477 readelf.c:2520 readelf.c:2561 -#: readelf.c:3074 readelf.c:3115 readelf.c:3291 readelf.c:4299 readelf.c:4313 -#: readelf.c:7068 readelf.c:7108 +#: readelf.c:2265 readelf.c:2441 readelf.c:2483 readelf.c:2526 readelf.c:2567 +#: readelf.c:3080 readelf.c:3121 readelf.c:3297 readelf.c:4305 readelf.c:4319 +#: readelf.c:7087 readelf.c:7127 msgid "Out of memory\n" msgstr "" -#: readelf.c:2277 +#: readelf.c:2283 #, c-format msgid "" "\n" "Program Header%s:\n" msgstr "" -#: readelf.c:2281 +#: readelf.c:2287 msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align\n" msgstr "" -#: readelf.c:2285 +#: readelf.c:2291 msgid " Type Offset VirtAddr PhysAddr\n" msgstr "" -#: readelf.c:2287 +#: readelf.c:2293 msgid " FileSiz MemSiz Flags Align\n" msgstr "" -#: readelf.c:2345 +#: readelf.c:2351 msgid "more than one dynamic segment\n" msgstr "" -#: readelf.c:2353 +#: readelf.c:2359 msgid "Unable to find program interpreter name\n" msgstr "" -#: readelf.c:2360 +#: readelf.c:2366 #, c-format msgid "" "\n" " [Requesting program interpreter: %s]" msgstr "" -#: readelf.c:2378 +#: readelf.c:2384 msgid "" "\n" " Section to Segment mapping:\n" msgstr "" -#: readelf.c:2379 +#: readelf.c:2385 msgid " Segment Sections...\n" msgstr "" -#: readelf.c:2642 +#: readelf.c:2648 msgid "" "\n" "There are no sections in this file.\n" msgstr "" -#: readelf.c:2648 +#: readelf.c:2654 #, c-format msgid "There are %d section headers, starting at offset 0x%lx:\n" msgstr "" -#: readelf.c:2688 +#: readelf.c:2694 msgid "File contains multiple dynamic symbol tables\n" msgstr "" -#: readelf.c:2701 +#: readelf.c:2707 msgid "File contains multiple dynamic string tables\n" msgstr "" -#: readelf.c:2728 +#: readelf.c:2734 #, c-format msgid "" "\n" "Section Header%s:\n" msgstr "" -#: readelf.c:2732 +#: readelf.c:2738 msgid "" " [Nr] Name Type Addr Off Size ES Flg Lk " "Inf Al\n" msgstr "" -#: readelf.c:2735 +#: readelf.c:2741 msgid " [Nr] Name Type Address Offset\n" msgstr "" -#: readelf.c:2736 +#: readelf.c:2742 msgid " Size EntSize Flags Link Info Align\n" msgstr "" -#: readelf.c:2783 +#: readelf.c:2789 msgid "" "Key to Flags: W (write), A (alloc), X (execute), M (merge), S (strings)\n" msgstr "" -#: readelf.c:2784 +#: readelf.c:2790 msgid "" " I (info), L (link order), O (extra OS processing required)\n" msgstr "" -#: readelf.c:2785 +#: readelf.c:2791 msgid " o (os specific), p (processor specific) x (unknown)\n" msgstr "" -#: readelf.c:2843 +#: readelf.c:2849 #, c-format msgid "" "\n" "Relocation section at offset 0x%lx contains %ld bytes:\n" msgstr "" -#: readelf.c:2850 +#: readelf.c:2856 msgid "" "\n" "There are no dynamic relocations in this file.\n" msgstr "" -#: readelf.c:2878 +#: readelf.c:2884 msgid "" "\n" "Relocation section " msgstr "" -#: readelf.c:2885 +#: readelf.c:2891 #, c-format msgid " at offset 0x%lx contains %lu entries:\n" msgstr "" -#: readelf.c:2913 +#: readelf.c:2919 msgid "" "\n" "There are no relocations in this file.\n" msgstr "" -#: readelf.c:3168 +#: readelf.c:3174 msgid "" "\n" "There is no dynamic segment in this file.\n" msgstr "" -#: readelf.c:3202 +#: readelf.c:3208 msgid "Unable to seek to end of file!" msgstr "" -#: readelf.c:3211 +#: readelf.c:3217 msgid "Unable to determine the number of symbols to load\n" msgstr "" -#: readelf.c:3241 +#: readelf.c:3247 msgid "Unable to seek to end of file\n" msgstr "" -#: readelf.c:3247 +#: readelf.c:3253 msgid "Unable to determine the length of the dynamic string table\n" msgstr "" -#: readelf.c:3308 +#: readelf.c:3314 #, c-format msgid "" "\n" "Dynamic segment at offset 0x%x contains %ld entries:\n" msgstr "" -#: readelf.c:3311 +#: readelf.c:3317 msgid " Tag Type Name/Value\n" msgstr "" -#: readelf.c:3347 +#: readelf.c:3353 msgid "Auxiliary library" msgstr "" -#: readelf.c:3351 +#: readelf.c:3357 msgid "Filter library" msgstr "" -#: readelf.c:3355 +#: readelf.c:3361 msgid "Configuration file" msgstr "" -#: readelf.c:3359 +#: readelf.c:3365 msgid "Dependency audit library" msgstr "" -#: readelf.c:3363 +#: readelf.c:3369 msgid "Audit library" msgstr "" -#: readelf.c:3381 readelf.c:3407 readelf.c:3433 +#: readelf.c:3387 readelf.c:3413 readelf.c:3439 msgid "Flags:" msgstr "" -#: readelf.c:3383 readelf.c:3409 readelf.c:3435 +#: readelf.c:3389 readelf.c:3415 readelf.c:3441 msgid " None\n" msgstr "" -#: readelf.c:3554 +#: readelf.c:3560 #, c-format msgid "Shared library: [%s]" msgstr "" -#: readelf.c:3557 +#: readelf.c:3563 msgid " program interpreter" msgstr "" -#: readelf.c:3561 +#: readelf.c:3567 #, c-format msgid "Library soname: [%s]" msgstr "" -#: readelf.c:3565 +#: readelf.c:3571 #, c-format msgid "Library rpath: [%s]" msgstr "" -#: readelf.c:3569 +#: readelf.c:3575 #, c-format msgid "Library runpath: [%s]" msgstr "" -#: readelf.c:3630 +#: readelf.c:3636 #, c-format msgid "Not needed object: [%s]\n" msgstr "" -#: readelf.c:3727 +#: readelf.c:3733 #, c-format msgid "" "\n" "Version definition section '%s' contains %ld entries:\n" msgstr "" -#: readelf.c:3730 +#: readelf.c:3736 msgid " Addr: 0x" msgstr "" -#: readelf.c:3732 readelf.c:3920 +#: readelf.c:3738 readelf.c:3926 #, c-format msgid " Offset: %#08lx Link: %lx (%s)\n" msgstr "" -#: readelf.c:3762 +#: readelf.c:3768 #, c-format msgid " %#06x: Rev: %d Flags: %s" msgstr "" -#: readelf.c:3765 +#: readelf.c:3771 #, c-format msgid " Index: %d Cnt: %d " msgstr "" -#: readelf.c:3776 +#: readelf.c:3782 #, c-format msgid "Name: %s\n" msgstr "" -#: readelf.c:3778 +#: readelf.c:3784 #, c-format msgid "Name index: %ld\n" msgstr "" -#: readelf.c:3793 +#: readelf.c:3799 #, c-format msgid " %#06x: Parent %d: %s\n" msgstr "" -#: readelf.c:3796 +#: readelf.c:3802 #, c-format msgid " %#06x: Parent %d, name index: %ld\n" msgstr "" -#: readelf.c:3815 +#: readelf.c:3821 #, c-format msgid "" "\n" "Version needs section '%s' contains %ld entries:\n" msgstr "" -#: readelf.c:3818 +#: readelf.c:3824 msgid " Addr: 0x" msgstr "" -#: readelf.c:3820 +#: readelf.c:3826 #, c-format msgid " Offset: %#08lx Link to section: %ld (%s)\n" msgstr "" -#: readelf.c:3846 +#: readelf.c:3852 #, c-format msgid " %#06x: Version: %d" msgstr "" -#: readelf.c:3849 +#: readelf.c:3855 #, c-format msgid " File: %s" msgstr "" -#: readelf.c:3851 +#: readelf.c:3857 #, c-format msgid " File: %lx" msgstr "" -#: readelf.c:3853 +#: readelf.c:3859 #, c-format msgid " Cnt: %d\n" msgstr "" -#: readelf.c:3871 +#: readelf.c:3877 #, c-format msgid " %#06x: Name: %s" msgstr "" -#: readelf.c:3874 +#: readelf.c:3880 #, c-format msgid " %#06x: Name index: %lx" msgstr "" -#: readelf.c:3877 +#: readelf.c:3883 #, c-format msgid " Flags: %s Version: %d\n" msgstr "" -#: readelf.c:3915 +#: readelf.c:3921 #, c-format msgid "" "\n" "Version symbols section '%s' contains %d entries:\n" msgstr "" -#: readelf.c:3918 +#: readelf.c:3924 msgid " Addr: " msgstr "" -#: readelf.c:3948 +#: readelf.c:3954 msgid " 0 (*local*) " msgstr "" -#: readelf.c:3952 +#: readelf.c:3958 msgid " 1 (*global*) " msgstr "" -#: readelf.c:4174 +#: readelf.c:4180 msgid "" "\n" "No version information found in this file.\n" msgstr "" -#: readelf.c:4192 readelf.c:4227 +#: readelf.c:4198 readelf.c:4233 #, c-format msgid ": %d" msgstr "" -#: readelf.c:4194 readelf.c:4239 +#: readelf.c:4200 readelf.c:4245 #, c-format msgid ": %d" msgstr "" -#: readelf.c:4196 readelf.c:4242 +#: readelf.c:4202 readelf.c:4248 #, c-format msgid ": %d" msgstr "" -#: readelf.c:4305 +#: readelf.c:4311 msgid "Unable to read in dynamic data\n" msgstr "" -#: readelf.c:4347 +#: readelf.c:4353 msgid "Unable to seek to start of dynamic information" msgstr "" -#: readelf.c:4353 +#: readelf.c:4359 msgid "Failed to read in number of buckets\n" msgstr "" -#: readelf.c:4359 +#: readelf.c:4365 msgid "Failed to read in number of chains\n" msgstr "" -#: readelf.c:4379 +#: readelf.c:4385 msgid "" "\n" "Symbol table for image:\n" msgstr "" -#: readelf.c:4381 +#: readelf.c:4387 msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4383 +#: readelf.c:4389 msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4427 +#: readelf.c:4433 #, c-format msgid "" "\n" "Symbol table '%s' contains %lu entries:\n" msgstr "" -#: readelf.c:4431 +#: readelf.c:4437 msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4433 +#: readelf.c:4439 msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4542 +#: readelf.c:4548 msgid "bad dynamic symbol" msgstr "" -#: readelf.c:4601 +#: readelf.c:4607 msgid "" "\n" "Dynamic symbol information is not available for displaying symbols.\n" msgstr "" -#: readelf.c:4613 +#: readelf.c:4619 #, c-format msgid "" "\n" "Histogram for bucket list length (total of %d buckets):\n" msgstr "" -#: readelf.c:4615 +#: readelf.c:4621 msgid " Length Number %% of total Coverage\n" msgstr "" -#: readelf.c:4620 readelf.c:4639 readelf.c:6750 readelf.c:6943 +#: readelf.c:4626 readelf.c:4645 readelf.c:6769 readelf.c:6962 msgid "Out of memory" msgstr "" -#: readelf.c:4688 +#: readelf.c:4694 #, c-format msgid "" "\n" "Dynamic info segment at offset 0x%lx contains %d entries:\n" msgstr "" -#: readelf.c:4691 +#: readelf.c:4697 msgid " Num: Name BoundTo Flags\n" msgstr "" -#: readelf.c:4739 +#: readelf.c:4745 #, c-format msgid "" "\n" "Assembly dump of section %s\n" msgstr "" -#: readelf.c:4762 +#: readelf.c:4768 #, c-format msgid "" "\n" "Section '%s' has no data to dump.\n" msgstr "" -#: readelf.c:4767 +#: readelf.c:4773 #, c-format msgid "" "\n" "Hex dump of section '%s':\n" msgstr "" -#: readelf.c:4919 +#: readelf.c:4925 msgid "badly formed extended line op encountered!" msgstr "" -#: readelf.c:4926 +#: readelf.c:4932 #, c-format msgid " Extended opcode %d: " msgstr "" -#: readelf.c:4931 +#: readelf.c:4937 msgid "" "End of Sequence\n" "\n" msgstr "" -#: readelf.c:4937 +#: readelf.c:4943 #, c-format msgid "set Address to 0x%lx\n" msgstr "" -#: readelf.c:4942 +#: readelf.c:4948 msgid " define new File Table entry\n" msgstr "" -#: readelf.c:4943 readelf.c:5065 +#: readelf.c:4949 readelf.c:5071 msgid " Entry\tDir\tTime\tSize\tName\n" msgstr "" -#: readelf.c:4945 +#: readelf.c:4951 #, c-format msgid " %d\t" msgstr "" -#: readelf.c:4948 readelf.c:4950 readelf.c:4952 readelf.c:5077 readelf.c:5079 -#: readelf.c:5081 +#: readelf.c:4954 readelf.c:4956 readelf.c:4958 readelf.c:5083 readelf.c:5085 +#: readelf.c:5087 #, c-format msgid "%lu\t" msgstr "" -#: readelf.c:4953 +#: readelf.c:4959 #, c-format msgid "" "%s\n" "\n" msgstr "" -#: readelf.c:4957 +#: readelf.c:4963 #, c-format msgid "UNKNOWN: length %d\n" msgstr "" -#: readelf.c:4983 +#: readelf.c:4989 #, c-format msgid "" "\n" @@ -2926,493 +2948,497 @@ msgid "" "\n" msgstr "" -#: readelf.c:4995 +#: readelf.c:5001 msgid "The line info appears to be corrupt - the section is too small\n" msgstr "" -#: readelf.c:5003 +#: readelf.c:5009 msgid "Only DWARF version 2 line info is currently supported.\n" msgstr "" -#: readelf.c:5018 +#: readelf.c:5024 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:5019 +#: readelf.c:5025 #, c-format msgid " DWARF Version: %d\n" msgstr "" -#: readelf.c:5020 +#: readelf.c:5026 #, c-format msgid " Prolgue Length: %d\n" msgstr "" -#: readelf.c:5021 +#: readelf.c:5027 #, c-format msgid " Minimum Instruction Length: %d\n" msgstr "" -#: readelf.c:5022 +#: readelf.c:5028 #, c-format msgid " Initial value of 'is_stmt': %d\n" msgstr "" -#: readelf.c:5023 +#: readelf.c:5029 #, c-format msgid " Line Base: %d\n" msgstr "" -#: readelf.c:5024 +#: readelf.c:5030 #, c-format msgid " Line Range: %d\n" msgstr "" -#: readelf.c:5025 +#: readelf.c:5031 #, c-format msgid " Opcode Base: %d\n" msgstr "" -#: readelf.c:5034 +#: readelf.c:5040 msgid "" "\n" " Opcodes:\n" msgstr "" -#: readelf.c:5037 +#: readelf.c:5043 #, c-format msgid " Opcode %d has %d args\n" msgstr "" -#: readelf.c:5043 +#: readelf.c:5049 msgid "" "\n" " The Directory Table is empty.\n" msgstr "" -#: readelf.c:5046 +#: readelf.c:5052 msgid "" "\n" " The Directory Table:\n" msgstr "" -#: readelf.c:5050 +#: readelf.c:5056 #, c-format msgid " %s\n" msgstr "" -#: readelf.c:5061 +#: readelf.c:5067 msgid "" "\n" " The File Name Table is empty.\n" msgstr "" -#: readelf.c:5064 +#: readelf.c:5070 msgid "" "\n" " The File Name Table:\n" msgstr "" -#: readelf.c:5072 +#: readelf.c:5078 #, c-format msgid " %d\t" msgstr "" -#: readelf.c:5083 +#: readelf.c:5089 #, c-format msgid "%s\n" msgstr "" #. Now display the statements. -#: readelf.c:5091 +#: readelf.c:5097 msgid "" "\n" " Line Number Statements:\n" msgstr "" -#: readelf.c:5110 +#: readelf.c:5116 msgid " Copy\n" msgstr "" -#: readelf.c:5117 +#: readelf.c:5123 #, c-format msgid " Advance PC by %d to %lx\n" msgstr "" -#: readelf.c:5125 +#: readelf.c:5131 #, c-format msgid " Advance Line by %d to %d\n" msgstr "" -#: readelf.c:5132 +#: readelf.c:5138 #, c-format msgid " Set File Name to entry %d in the File Name Table\n" msgstr "" -#: readelf.c:5140 +#: readelf.c:5146 #, c-format msgid " Set column to %d\n" msgstr "" -#: readelf.c:5147 +#: readelf.c:5153 #, c-format msgid " Set is_stmt to %d\n" msgstr "" -#: readelf.c:5152 +#: readelf.c:5158 msgid " Set basic block\n" msgstr "" -#: readelf.c:5160 +#: readelf.c:5166 #, c-format msgid " Advance PC by constant %d to 0x%lx\n" msgstr "" -#: readelf.c:5168 +#: readelf.c:5174 #, c-format msgid " Advance PC by fixed size amount %d to 0x%lx\n" msgstr "" -#: readelf.c:5176 +#: readelf.c:5182 #, c-format msgid " Special opcode %d: advance Address by %d to 0x%lx" msgstr "" -#: readelf.c:5180 +#: readelf.c:5186 #, c-format msgid " and Line by %d to %d\n" msgstr "" -#: readelf.c:5203 readelf.c:5625 +#: readelf.c:5209 readelf.c:5638 #, c-format msgid "" "Contents of the %s section:\n" "\n" msgstr "" -#: readelf.c:5222 -msgid "Only DWARF 2 pubnames are currently supported" +#: readelf.c:5232 +msgid "Only DWARF 2 pubnames are currently supported\n" msgstr "" -#: readelf.c:5226 +#: readelf.c:5239 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:5228 +#: readelf.c:5241 #, c-format msgid " Version: %d\n" msgstr "" -#: readelf.c:5230 +#: readelf.c:5243 #, c-format msgid " Offset into .debug_info section: %ld\n" msgstr "" -#: readelf.c:5232 +#: readelf.c:5245 #, c-format msgid " Size of area in .debug_info section: %ld\n" msgstr "" -#: readelf.c:5235 +#: readelf.c:5248 msgid "" "\n" " Offset\tName\n" msgstr "" -#: readelf.c:5317 +#: readelf.c:5330 #, c-format msgid "Unknown TAG value: %lx" msgstr "" -#: readelf.c:5412 +#: readelf.c:5425 #, c-format msgid "Unknown AT value: %lx" msgstr "" -#: readelf.c:5449 +#: readelf.c:5462 #, c-format msgid "Unknown FORM value: %lx" msgstr "" -#: readelf.c:5631 +#: readelf.c:5644 msgid " Number TAG\n" msgstr "" -#: readelf.c:5637 +#: readelf.c:5650 #, c-format msgid " %ld %s [%s]\n" msgstr "" -#: readelf.c:5640 +#: readelf.c:5653 msgid "has children" msgstr "" -#: readelf.c:5640 +#: readelf.c:5653 msgid "no children" msgstr "" -#: readelf.c:5644 +#: readelf.c:5657 #, c-format msgid " %-18s %s\n" msgstr "" -#: readelf.c:5663 +#: readelf.c:5676 #, c-format msgid " %lu byte block: " msgstr "" -#: readelf.c:5970 +#: readelf.c:5983 msgid "(User defined location op)" msgstr "" -#: readelf.c:5972 +#: readelf.c:5985 msgid "(Unknown location op)" msgstr "" -#: readelf.c:6099 +#: readelf.c:6112 #, c-format msgid "Unable to handle FORM: %d" msgstr "" -#: readelf.c:6103 +#: readelf.c:6116 #, c-format msgid "Unrecognised form: %d" msgstr "" -#: readelf.c:6116 +#: readelf.c:6129 msgid "(not inlined)" msgstr "" -#: readelf.c:6117 +#: readelf.c:6130 msgid "(inlined)" msgstr "" -#: readelf.c:6118 +#: readelf.c:6131 msgid "(declared as inline but ignored)" msgstr "" -#: readelf.c:6119 +#: readelf.c:6132 msgid "(declared as inline and inlined)" msgstr "" -#: readelf.c:6120 +#: readelf.c:6133 #, c-format msgid " (Unknown inline attribute value: %lx)" msgstr "" -#: readelf.c:6249 readelf.c:6375 +#: readelf.c:6262 readelf.c:6388 #, c-format msgid "" "The section %s contains:\n" "\n" msgstr "" -#: readelf.c:6273 +#: readelf.c:6286 msgid "Only version 2 DWARF debug information is currently supported.\n" msgstr "" -#: readelf.c:6277 +#: readelf.c:6290 msgid " Compilation Unit:\n" msgstr "" -#: readelf.c:6278 +#: readelf.c:6291 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:6279 +#: readelf.c:6292 #, c-format msgid " Version: %d\n" msgstr "" -#: readelf.c:6280 +#: readelf.c:6293 #, c-format msgid " Abbrev Offset: %ld\n" msgstr "" -#: readelf.c:6281 +#: readelf.c:6294 #, c-format msgid " Pointer Size: %d\n" msgstr "" -#: readelf.c:6301 +#: readelf.c:6314 msgid "Unable to locate .debug_abbrev section!\n" msgstr "" -#: readelf.c:6341 +#: readelf.c:6354 #, c-format msgid "Unable to locate entry %lu in the abbreviation table\n" msgstr "" -#: readelf.c:6346 +#: readelf.c:6359 #, c-format msgid " <%d><%x>: Abbrev Number: %lu (%s)\n" msgstr "" -#: readelf.c:6394 +#: readelf.c:6409 +msgid "Only DWARF 2 aranges are currently supported.\n" +msgstr "" + +#: readelf.c:6413 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:6395 +#: readelf.c:6414 #, c-format msgid " Version: %d\n" msgstr "" -#: readelf.c:6396 +#: readelf.c:6415 #, c-format msgid " Offset into .debug_info: %lx\n" msgstr "" -#: readelf.c:6397 +#: readelf.c:6416 #, c-format msgid " Pointer Size: %d\n" msgstr "" -#: readelf.c:6398 +#: readelf.c:6417 #, c-format msgid " Segment Size: %d\n" msgstr "" -#: readelf.c:6400 +#: readelf.c:6419 msgid "" "\n" " Address Length\n" msgstr "" -#: readelf.c:6441 +#: readelf.c:6460 #, c-format msgid "Displaying the debug contents of section %s is not yet supported.\n" msgstr "" -#: readelf.c:6503 +#: readelf.c:6522 #, c-format msgid "" "\n" "Section '%s' has no debugging data.\n" msgstr "" -#: readelf.c:6519 +#: readelf.c:6538 #, c-format msgid "Unrecognised debug section: %s\n" msgstr "" -#: readelf.c:6591 +#: readelf.c:6610 msgid "Some sections were not dumped because they do not exist!\n" msgstr "" -#: readelf.c:6774 +#: readelf.c:6793 #, c-format msgid "" "\n" "Section '%s' contains %d entries:\n" msgstr "" -#: readelf.c:6936 +#: readelf.c:6955 msgid "conflict list with without table" msgstr "" -#: readelf.c:6964 +#: readelf.c:6983 #, c-format msgid "" "\n" "Section '.conflict' contains %d entries:\n" msgstr "" -#: readelf.c:6965 +#: readelf.c:6984 msgid " Num: Index Value Name" msgstr "" -#: readelf.c:6990 +#: readelf.c:7009 msgid "NT_PRSTATUS (prstatus structure)" msgstr "" -#: readelf.c:6991 +#: readelf.c:7010 msgid "NT_FPREGSET (floating point registers)" msgstr "" -#: readelf.c:6992 +#: readelf.c:7011 msgid "NT_PRPSINFO (prpsinfo structure)" msgstr "" -#: readelf.c:6993 +#: readelf.c:7012 msgid "NT_TASKSTRUCT (task structure)" msgstr "" -#: readelf.c:6994 +#: readelf.c:7013 msgid "NT_PRXFPREG (user_xfpregs structure)" msgstr "" -#: readelf.c:6995 +#: readelf.c:7014 msgid "NT_PSTATUS (pstatus structure)" msgstr "" -#: readelf.c:6996 +#: readelf.c:7015 msgid "NT_FPREGS (floating point registers)" msgstr "" -#: readelf.c:6997 +#: readelf.c:7016 msgid "NT_PSINFO (psinfo structure)" msgstr "" -#: readelf.c:6998 +#: readelf.c:7017 msgid "NT_LWPSTATUS (lwpstatus_t structure)" msgstr "" -#: readelf.c:6999 +#: readelf.c:7018 msgid "NT_LWPSINFO (lwpsinfo_t structure)" msgstr "" -#: readelf.c:7000 +#: readelf.c:7019 msgid "NT_WIN32PSTATUS (win32_pstatus strcuture)" msgstr "" -#: readelf.c:7002 +#: readelf.c:7021 #, c-format msgid "Unknown note type: (0x%08x)" msgstr "" -#: readelf.c:7040 +#: readelf.c:7059 #, c-format msgid "" "\n" "Notes at offset 0x%08lx with length 0x%08lx:\n" msgstr "" -#: readelf.c:7042 +#: readelf.c:7061 msgid " Owner\t\tData size\tDescription\n" msgstr "" -#: readelf.c:7153 +#: readelf.c:7172 msgid "No note segments present in the core file.\n" msgstr "" -#: readelf.c:7231 +#: readelf.c:7250 msgid "This instance of readelf has been built without support for a\n" msgstr "" -#: readelf.c:7232 +#: readelf.c:7251 msgid "64 bit data type and so it cannot read 64 bit ELF files.\n" msgstr "" -#: readelf.c:7267 +#: readelf.c:7286 #, c-format msgid "Cannot stat input file %s.\n" msgstr "" -#: readelf.c:7274 +#: readelf.c:7293 #, c-format msgid "Input file %s not found.\n" msgstr "" -#: readelf.c:7280 +#: readelf.c:7299 #, c-format msgid "%s: Failed to read file header\n" msgstr "" -#: readelf.c:7294 +#: readelf.c:7313 #, c-format msgid "" "\n" @@ -3753,50 +3779,50 @@ msgstr "" msgid "Using `%s'\n" msgstr "" -#: resrc.c:547 +#: resrc.c:541 #, c-format msgid "%s:%d: %s\n" msgstr "" -#: resrc.c:556 +#: resrc.c:550 #, c-format msgid "%s: unexpected EOF" msgstr "" -#: resrc.c:613 +#: resrc.c:607 #, c-format msgid "%s: read of %lu returned %lu" msgstr "" -#: resrc.c:655 resrc.c:909 resrc.c:1182 resrc.c:1336 +#: resrc.c:649 resrc.c:903 resrc.c:1176 resrc.c:1330 #, c-format msgid "stat failed on bitmap file `%s': %s" msgstr "" -#: resrc.c:708 +#: resrc.c:702 #, c-format msgid "cursor file `%s' does not contain cursor data" msgstr "" -#: resrc.c:740 resrc.c:1053 +#: resrc.c:734 resrc.c:1047 #, c-format msgid "%s: fseek to %lu failed: %s" msgstr "" -#: resrc.c:877 +#: resrc.c:871 msgid "help ID requires DIALOGEX" msgstr "" -#: resrc.c:879 +#: resrc.c:873 msgid "control data requires DIALOGEX" msgstr "" -#: resrc.c:1022 +#: resrc.c:1016 #, c-format msgid "icon file `%s' does not contain icon data" msgstr "" -#: resrc.c:1541 +#: resrc.c:1535 #, c-format msgid "can't open `%s' for output: %s" msgstr "" diff --git a/gas/ChangeLog b/gas/ChangeLog index ba7429c3f89..59e7351bf79 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2000-09-02 Nick Clifton + + * configure.in: Increase version number to 2.10.91. + * configure: Regenerate. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * po/gas.pot: Regenerate. + * Makefile.in: Regenerate. + 2000-09-01 Alexandre Oliva * config/tc-sh.h [OBJ_ELF] (TC_FIX_ADJUSTABLE): Define. diff --git a/gas/Makefile.in b/gas/Makefile.in index bd72f437391..20ba384f571 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -69,6 +69,8 @@ BFDLIB = @BFDLIB@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ @@ -89,11 +91,13 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ OPCODES_LIB = @OPCODES_LIB@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1860,17 +1864,22 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -itbl_test_OBJECTS = itbl-parse.o itbl-lex.o +itbl_test_OBJECTS = itbl-parse.$(OBJEXT) itbl-lex.$(OBJEXT) itbl_test_DEPENDENCIES = itbl-tops.o itbl-test.o \ ../libiberty/libiberty.a itbl_test_LDFLAGS = -as_new_OBJECTS = app.o as.o atof-generic.o bignum-copy.o cond.o \ -depend.o dwarf2dbg.o ecoff.o ehopt.o expr.o flonum-copy.o \ -flonum-konst.o flonum-mult.o frags.o hash.o input-file.o input-scrub.o \ -listing.o literal.o macro.o messages.o output-file.o read.o sb.o \ -stabs.o subsegs.o symbols.o write.o +as_new_OBJECTS = app.$(OBJEXT) as.$(OBJEXT) atof-generic.$(OBJEXT) \ +bignum-copy.$(OBJEXT) cond.$(OBJEXT) depend.$(OBJEXT) \ +dwarf2dbg.$(OBJEXT) ecoff.$(OBJEXT) ehopt.$(OBJEXT) expr.$(OBJEXT) \ +flonum-copy.$(OBJEXT) flonum-konst.$(OBJEXT) flonum-mult.$(OBJEXT) \ +frags.$(OBJEXT) hash.$(OBJEXT) input-file.$(OBJEXT) \ +input-scrub.$(OBJEXT) listing.$(OBJEXT) literal.$(OBJEXT) \ +macro.$(OBJEXT) messages.$(OBJEXT) output-file.$(OBJEXT) read.$(OBJEXT) \ +sb.$(OBJEXT) stabs.$(OBJEXT) subsegs.$(OBJEXT) symbols.$(OBJEXT) \ +write.$(OBJEXT) as_new_LDFLAGS = -gasp_new_OBJECTS = gasp.o macro.o sb.o hash.o +gasp_new_OBJECTS = gasp.$(OBJEXT) macro.$(OBJEXT) sb.$(OBJEXT) \ +hash.$(OBJEXT) gasp_new_LDFLAGS = SCRIPTS = $(noinst_SCRIPTS) @@ -1896,7 +1905,7 @@ OBJECTS = $(itbl_test_OBJECTS) $(as_new_OBJECTS) $(gasp_new_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .l .lo .o .s .y +.SUFFIXES: .S .c .l .lo .o .obj .s .y $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -1954,6 +1963,11 @@ maintainer-clean-noinstPROGRAMS: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -1962,6 +1976,7 @@ maintainer-clean-noinstPROGRAMS: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index 2a3ccb77f9d..4acac7fbbf3 100644 --- a/gas/aclocal.m4 +++ b/gas/aclocal.m4 @@ -207,6 +207,351 @@ AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") AC_PROG_LEX AC_DECL_YYTEXT]) +# This file is derived from `gettext.m4'. The difference is that the +# included macros assume Cygnus-style source and build trees. + +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 3 + +AC_DEFUN(CY_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define as 1 if you have gettext and don't want to use GNU gettext.]) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + dnl In the standard gettext, we would now check for catgets. + dnl However, we never want to use catgets for our releases. + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/../intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(CY_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function]) + fi + + AM_LC_MESSAGES + CY_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + if test -f $srcdir/po2tbl.sed.in; then + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/po2tbl.sed.in > po2tbl.sed + fi + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. But only do this if the po directory + dnl exists in srcdir. + if test -d $srcdir/po; then + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + fi + ]) + +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) + # Add --enable-maintainer-mode option to configure. # From Jim Meyering diff --git a/gas/config.in b/gas/config.in index 241e018db52..e5c28245a12 100644 --- a/gas/config.in +++ b/gas/config.in @@ -142,6 +142,18 @@ /* Define if you have the header file. */ #undef HAVE_VARARGS_H +/* Define if you have the stpcpy function */ +#undef HAVE_STPCPY + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if NLS is requested */ +#undef ENABLE_NLS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + /* Name of package */ #undef PACKAGE diff --git a/gas/configure b/gas/configure index 8bba60caf38..c9984ffac3c 100755 --- a/gas/configure +++ b/gas/configure @@ -871,7 +871,7 @@ fi PACKAGE=gas -VERSION=2.10.90 +VERSION=2.10.91 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/gas/configure.in b/gas/configure.in index fd23ef2ecb4..f5573d6a795 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -10,7 +10,7 @@ AC_INIT(as.h) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(gas, 2.10.90) +AM_INIT_AUTOMAKE(gas, 2.10.91) AM_PROG_LIBTOOL diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 4e7389c99e2..692d3ad4165 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -69,6 +69,8 @@ BFDLIB = @BFDLIB@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ @@ -91,11 +93,13 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ OPCODES_LIB = @OPCODES_LIB@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gas/po/gas.pot b/gas/po/gas.pot index 38e52c65b6d..21a27b906ec 100644 --- a/gas/po/gas.pot +++ b/gas/po/gas.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-08-25 11:26-0700\n" +"POT-Creation-Date: 2000-09-02 13:48-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,31 +59,31 @@ msgstr "" msgid "EOF in Comment: Newline inserted" msgstr "" -#: as.c:149 +#: as.c:148 msgid "missing emulation mode name" msgstr "" -#: as.c:164 +#: as.c:163 #, c-format msgid "unrecognized emulation name `%s'" msgstr "" -#: as.c:211 +#: as.c:210 #, c-format msgid "GNU assembler version %s (%s) using BFD version %s" msgstr "" -#: as.c:214 +#: as.c:213 #, c-format msgid "GNU assembler version %s (%s)" msgstr "" -#: as.c:223 +#: as.c:222 #, c-format msgid "Usage: %s [option...] [asmfile...]\n" msgstr "" -#: as.c:225 +#: as.c:224 msgid "" "Options:\n" " -a[sub-option...]\t turn on listings\n" @@ -100,135 +100,135 @@ msgid "" " \t =FILE list to FILE (must be last sub-option)\n" msgstr "" -#: as.c:239 +#: as.c:238 msgid " -D produce assembler debugging messages\n" msgstr "" -#: as.c:241 +#: as.c:240 msgid " --defsym SYM=VAL define symbol SYM to given value\n" msgstr "" -#: as.c:257 +#: as.c:256 #, c-format msgid " emulate output (default %s)\n" msgstr "" -#: as.c:261 +#: as.c:260 msgid " -f skip whitespace and comment preprocessing\n" msgstr "" -#: as.c:263 +#: as.c:262 msgid " --gstabs generate stabs debugging information\n" msgstr "" -#: as.c:265 +#: as.c:264 msgid " --gdwarf2 generate DWARF2 debugging information\n" msgstr "" -#: as.c:267 +#: as.c:266 msgid " --help show this message and exit\n" msgstr "" -#: as.c:269 +#: as.c:268 msgid "" " -I DIR add DIR to search list for .include directives\n" msgstr "" -#: as.c:271 +#: as.c:270 msgid " -J don't warn about signed overflow\n" msgstr "" -#: as.c:273 +#: as.c:272 msgid "" " -K warn when differences altered for long " "displacements\n" msgstr "" -#: as.c:275 +#: as.c:274 msgid " -L,--keep-locals keep local symbols (e.g. starting with `L')\n" msgstr "" -#: as.c:277 +#: as.c:276 msgid " -M,--mri assemble in MRI compatibility mode\n" msgstr "" -#: as.c:279 +#: as.c:278 msgid "" " --MD FILE write dependency information in FILE (default " "none)\n" msgstr "" -#: as.c:281 +#: as.c:280 msgid " -nocpp ignored\n" msgstr "" -#: as.c:283 +#: as.c:282 msgid "" " -o OBJFILE name the object-file output OBJFILE (default " "a.out)\n" msgstr "" -#: as.c:285 +#: as.c:284 msgid " -R fold data section into text section\n" msgstr "" -#: as.c:287 +#: as.c:286 msgid "" " --statistics print various measured statistics from execution\n" msgstr "" -#: as.c:289 +#: as.c:288 msgid " --strip-local-absolute strip local absolute symbols\n" msgstr "" -#: as.c:291 +#: as.c:290 msgid "" " --traditional-format Use same format as native assembler when possible\n" msgstr "" -#: as.c:293 +#: as.c:292 msgid " --version print assembler version number and exit\n" msgstr "" -#: as.c:295 +#: as.c:294 msgid " -W --no-warn suppress warnings\n" msgstr "" -#: as.c:297 +#: as.c:296 msgid " --warn don't suppress warnings\n" msgstr "" -#: as.c:299 +#: as.c:298 msgid " --fatal-warnings treat warnings as errors\n" msgstr "" -#: as.c:301 +#: as.c:300 msgid "" " --itbl INSTTBL extend instruction set to include instructions\n" " matching the specifications defined in file " "INSTTBL\n" msgstr "" -#: as.c:304 +#: as.c:303 msgid " -w ignored\n" msgstr "" -#: as.c:306 +#: as.c:305 msgid " -X ignored\n" msgstr "" -#: as.c:308 +#: as.c:307 msgid " -Z generate object file even after errors\n" msgstr "" -#: as.c:310 +#: as.c:309 msgid "" " --listing-lhs-width set the width in words of the output data column " "of\n" " the listing\n" msgstr "" -#: as.c:313 +#: as.c:312 msgid "" " --listing-lhs-width2 set the width in words of the continuation lines\n" " of the output data column; ignored if smaller " @@ -236,106 +236,106 @@ msgid "" " the width of the first line\n" msgstr "" -#: as.c:317 +#: as.c:316 msgid "" " --listing-rhs-width set the max width in characters of the lines from\n" " the source file\n" msgstr "" -#: as.c:320 +#: as.c:319 msgid "" " --listing-cont-lines set the maximum number of continuation lines used\n" " for the output data column of the listing\n" msgstr "" -#: as.c:327 gasp.c:3543 +#: as.c:326 gasp.c:3543 #, c-format msgid "Report bugs to %s\n" msgstr "" #. This output is intended to follow the GNU standards document. -#: as.c:522 +#: as.c:519 #, c-format msgid "GNU assembler %s\n" msgstr "" -#: as.c:523 +#: as.c:520 msgid "Copyright 2000 Free Software Foundation, Inc.\n" msgstr "" -#: as.c:524 gasp.c:3637 +#: as.c:521 gasp.c:3637 msgid "" "This program is free software; you may redistribute it under the terms of\n" "the GNU General Public License. This program has absolutely no warranty.\n" msgstr "" -#: as.c:527 +#: as.c:524 #, c-format msgid "This assembler was configured for a target of `%s'.\n" msgstr "" -#: as.c:534 +#: as.c:531 msgid "multiple emulation names specified" msgstr "" -#: as.c:536 +#: as.c:533 msgid "emulations not handled in this configuration" msgstr "" -#: as.c:541 +#: as.c:538 #, c-format msgid "alias = %s\n" msgstr "" -#: as.c:542 +#: as.c:539 #, c-format msgid "canonical = %s\n" msgstr "" -#: as.c:543 +#: as.c:540 #, c-format msgid "cpu-type = %s\n" msgstr "" -#: as.c:545 +#: as.c:542 #, c-format msgid "format = %s\n" msgstr "" -#: as.c:548 +#: as.c:545 #, c-format msgid "bfd-target = %s\n" msgstr "" -#: as.c:561 +#: as.c:558 msgid "bad defsym; format is --defsym name=value" msgstr "" -#: as.c:585 +#: as.c:582 msgid "No file name following -t option\n" msgstr "" -#: as.c:601 +#: as.c:598 #, c-format msgid "Failed to read instruction table %s\n" msgstr "" -#: as.c:718 +#: as.c:715 #, c-format msgid "invalid listing option `%c'" msgstr "" -#: as.c:912 +#: as.c:910 #, c-format msgid "%d warnings, treating warnings as errors" msgstr "" -#: as.c:943 +#: as.c:941 #, c-format msgid "%s: total time in assembly: %ld.%06ld\n" msgstr "" -#: as.c:946 +#: as.c:944 #, c-format msgid "%s: data size %ld\n" msgstr "" @@ -350,67 +350,67 @@ msgstr "" msgid "failed sanity check." msgstr "" -#: cond.c:75 +#: cond.c:79 msgid "invalid identifier for \".ifdef\"" msgstr "" -#: cond.c:128 +#: cond.c:133 msgid "non-constant expression in \".if\" statement" msgstr "" -#: cond.c:224 +#: cond.c:229 msgid "bad format for ifc or ifnc" msgstr "" -#: cond.c:258 +#: cond.c:263 msgid "\".elseif\" without matching \".if\" - ignored" msgstr "" -#: cond.c:263 +#: cond.c:268 msgid "\".elseif\" after \".else\" - ignored" msgstr "" -#: cond.c:266 cond.c:375 +#: cond.c:271 cond.c:380 msgid "here is the previous \"else\"" msgstr "" -#: cond.c:269 cond.c:378 +#: cond.c:274 cond.c:383 msgid "here is the previous \"if\"" msgstr "" -#: cond.c:302 +#: cond.c:307 msgid "non-constant expression in \".elseif\" statement" msgstr "" -#: cond.c:337 +#: cond.c:342 msgid "\".endif\" without \".if\"" msgstr "" -#: cond.c:367 +#: cond.c:372 msgid ".else without matching .if - ignored" msgstr "" -#: cond.c:372 +#: cond.c:377 msgid "duplicate \"else\" - ignored" msgstr "" -#: cond.c:423 +#: cond.c:428 msgid ".ifeqs syntax error" msgstr "" -#: cond.c:506 +#: cond.c:511 msgid "end of macro inside conditional" msgstr "" -#: cond.c:508 +#: cond.c:513 msgid "end of file inside conditional" msgstr "" -#: cond.c:511 +#: cond.c:516 msgid "here is the start of the unterminated conditional" msgstr "" -#: cond.c:515 +#: cond.c:520 msgid "here is the \"else\" of the unterminated conditional" msgstr "" @@ -552,12 +552,12 @@ msgstr "" msgid "unsupported section attribute '%c'" msgstr "" -#: config/obj-coff.c:1453 config/obj-coff.c:3740 config/tc-ppc.c:3917 +#: config/obj-coff.c:1453 config/obj-coff.c:3740 config/tc-ppc.c:3918 #, c-format msgid "unknown section attribute '%c'" msgstr "" -#: config/obj-coff.c:1483 config/tc-ppc.c:3935 read.c:2520 +#: config/obj-coff.c:1483 config/tc-ppc.c:3936 read.c:2520 #, c-format msgid "error setting flags for \"%s\": %s" msgstr "" @@ -686,7 +686,7 @@ msgstr "" msgid "Common alignment negative; 0 assumed" msgstr "" -#: config/obj-elf.c:377 config/tc-m32r.c:1296 config/tc-ppc.c:1514 +#: config/obj-elf.c:377 config/tc-m32r.c:1296 config/tc-ppc.c:1515 #: config/tc-v850.c:384 msgid "Common alignment not a power of 2" msgstr "" @@ -978,7 +978,7 @@ msgstr "" #: config/tc-a29k.c:375 config/tc-arc.c:535 config/tc-avr.c:1124 #: config/tc-d10v.c:511 config/tc-d30v.c:552 config/tc-h8300.c:296 #: config/tc-h8500.c:297 config/tc-mcore.c:656 config/tc-mn10200.c:954 -#: config/tc-mn10300.c:1339 config/tc-ppc.c:1970 config/tc-sh.c:636 +#: config/tc-mn10300.c:1339 config/tc-ppc.c:1971 config/tc-sh.c:834 #: config/tc-tic80.c:283 config/tc-v850.c:2081 config/tc-w65.c:247 #: config/tc-z8k.c:340 msgid "missing operand" @@ -1150,7 +1150,7 @@ msgstr "" #: config/tc-alpha.c:2434 config/tc-arc.c:548 config/tc-d10v.c:600 #: config/tc-d30v.c:640 config/tc-mn10200.c:1009 config/tc-mn10300.c:1410 -#: config/tc-ppc.c:1936 config/tc-ppc.c:2044 config/tc-ppc.c:2056 +#: config/tc-ppc.c:1937 config/tc-ppc.c:2045 config/tc-ppc.c:2057 #: config/tc-v850.c:1861 config/tc-v850.c:1884 config/tc-v850.c:2104 msgid "too many fixups" msgstr "" @@ -1218,13 +1218,13 @@ msgstr "" msgid "bad instruction format for lda !%s!%d" msgstr "" -#: config/tc-alpha.c:4291 config/tc-ppc.c:1463 config/tc-ppc.c:3681 +#: config/tc-alpha.c:4291 config/tc-ppc.c:1464 config/tc-ppc.c:3682 #: read.c:1377 #, c-format msgid ".COMMon length (%ld.) <0! Ignored." msgstr "" -#: config/tc-alpha.c:4329 config/tc-alpha.c:4338 config/tc-ppc.c:3718 +#: config/tc-alpha.c:4329 config/tc-alpha.c:4338 config/tc-ppc.c:3719 #: read.c:1401 #, c-format msgid "Length of .comm \"%s\" is already %ld. Not changed to %ld." @@ -1366,7 +1366,7 @@ msgstr "" #: config/tc-arc.c:155 config/tc-arc.c:178 config/tc-arc.c:922 #: config/tc-hppa.c:1377 config/tc-hppa.c:6898 config/tc-hppa.c:6904 #: config/tc-hppa.c:6910 config/tc-hppa.c:6916 config/tc-mn10300.c:928 -#: config/tc-mn10300.c:2138 +#: config/tc-mn10300.c:2136 msgid "could not set architecture and machine" msgstr "" @@ -1374,8 +1374,8 @@ msgstr "" msgid "virtual memory exhausted" msgstr "" -#: config/tc-arc.c:254 config/tc-mn10200.c:1374 config/tc-mn10300.c:2050 -#: config/tc-ppc.c:1220 config/tc-v850.c:1662 +#: config/tc-arc.c:254 config/tc-mn10200.c:1374 config/tc-mn10300.c:2048 +#: config/tc-ppc.c:1221 config/tc-v850.c:1662 #, c-format msgid "operand out of range (%s not between %ld and %ld)" msgstr "" @@ -1390,13 +1390,13 @@ msgid "too many suffixes" msgstr "" #: config/tc-arc.c:533 config/tc-d10v.c:509 config/tc-d30v.c:550 -#: config/tc-mn10200.c:951 config/tc-mn10300.c:1336 config/tc-ppc.c:1968 +#: config/tc-mn10200.c:951 config/tc-mn10300.c:1336 config/tc-ppc.c:1969 #: config/tc-tic80.c:279 config/tc-v850.c:2078 msgid "illegal operand" msgstr "" #: config/tc-arc.c:620 config/tc-mn10200.c:1050 config/tc-mn10300.c:1480 -#: config/tc-ppc.c:2093 config/tc-v850.c:2157 +#: config/tc-ppc.c:2094 config/tc-v850.c:2157 #, c-format msgid "junk at end of line: `%s'" msgstr "" @@ -1442,7 +1442,7 @@ msgstr "" msgid "bad .cpu op" msgstr "" -#: config/tc-arc.c:951 config/tc-ppc.c:2741 +#: config/tc-arc.c:951 config/tc-ppc.c:2742 msgid "missing rename string" msgstr "" @@ -1452,7 +1452,7 @@ msgstr "" #: config/tc-arc.c:1010 config/tc-avr.c:372 config/tc-d10v.c:291 #: config/tc-d30v.c:366 config/tc-mips.c:8781 config/tc-mn10200.c:375 -#: config/tc-pj.c:356 config/tc-ppc.c:4510 config/tc-sh.c:1853 +#: config/tc-pj.c:356 config/tc-ppc.c:4511 config/tc-sh.c:2069 #: config/tc-v850.c:1297 msgid "bad call to md_atof" msgstr "" @@ -1469,11 +1469,11 @@ msgstr "" #: config/tc-arc.c:1326 config/tc-arm.c:3411 config/tc-avr.c:852 #: config/tc-cris.c:2667 config/tc-d10v.c:1538 config/tc-d30v.c:1865 #: config/tc-mips.c:3264 config/tc-mips.c:4196 config/tc-mips.c:4981 -#: config/tc-mips.c:5527 config/tc-ppc.c:4846 config/tc-v850.c:2385 +#: config/tc-mips.c:5527 config/tc-ppc.c:4847 config/tc-v850.c:2385 msgid "expression too complex" msgstr "" -#: config/tc-arc.c:1392 config/tc-ppc.c:4948 config/tc-v850.c:2431 +#: config/tc-arc.c:1392 config/tc-ppc.c:4949 config/tc-v850.c:2431 msgid "unresolved expression that must be resolved" msgstr "" @@ -1957,7 +1957,7 @@ msgstr "" msgid "Illegal Thumb shift value: %ld" msgstr "" -#: config/tc-arm.c:6186 config/tc-mn10300.c:1966 +#: config/tc-arm.c:6186 config/tc-mn10300.c:1964 #, c-format msgid "Bad relocation fixup type (%d)" msgstr "" @@ -1990,7 +1990,7 @@ msgstr "" msgid "Can not represent %s relocation in this object file format (%d)" msgstr "" -#: config/tc-arm.c:6329 config/tc-mips.c:11349 config/tc-sh.c:2961 +#: config/tc-arm.c:6329 config/tc-mips.c:11349 config/tc-sh.c:3258 #, c-format msgid "Can not represent %s relocation in this object file format" msgstr "" @@ -2228,7 +2228,7 @@ msgid "only constant expression allowed" msgstr "" #: config/tc-avr.c:1060 config/tc-d10v.c:1473 config/tc-d30v.c:1807 -#: config/tc-mn10200.c:1254 config/tc-mn10300.c:1827 config/tc-ppc.c:5153 +#: config/tc-mn10200.c:1254 config/tc-mn10300.c:1827 config/tc-ppc.c:5154 #: config/tc-v850.c:2301 #, c-format msgid "reloc %d not supported by object file format" @@ -2236,7 +2236,7 @@ msgstr "" #: config/tc-avr.c:1084 config/tc-d10v.c:1080 config/tc-d10v.c:1094 #: config/tc-h8300.c:1239 config/tc-h8500.c:1102 config/tc-mcore.c:989 -#: config/tc-pj.c:265 config/tc-sh.c:1438 config/tc-z8k.c:1203 +#: config/tc-pj.c:265 config/tc-sh.c:1636 config/tc-z8k.c:1203 msgid "can't find opcode " msgstr "" @@ -2770,7 +2770,7 @@ msgid "invalid operands" msgstr "" #: config/tc-h8300.c:1250 config/tc-h8500.c:1108 config/tc-mips.c:7977 -#: config/tc-sh.c:1675 config/tc-w65.c:739 config/tc-z8k.c:1213 +#: config/tc-sh.c:1873 config/tc-w65.c:739 config/tc-z8k.c:1213 msgid "unknown opcode" msgstr "" @@ -2778,12 +2778,12 @@ msgstr "" msgid "mismatch between opcode size and operand size" msgstr "" -#: config/tc-h8300.c:1307 config/tc-h8500.c:1135 config/tc-sh.c:1808 +#: config/tc-h8300.c:1307 config/tc-h8500.c:1135 config/tc-sh.c:2024 #: config/tc-w65.c:769 config/tc-z8k.c:1266 msgid "call to tc_crawl_symbol_chain \n" msgstr "" -#: config/tc-h8300.c:1321 config/tc-h8500.c:1149 config/tc-sh.c:1815 +#: config/tc-h8300.c:1321 config/tc-h8500.c:1149 config/tc-sh.c:2031 #: config/tc-w65.c:783 config/tc-z8k.c:1280 msgid "call to tc_headers_hook \n" msgstr "" @@ -2828,22 +2828,22 @@ msgstr "" msgid "@Rn needs word register" msgstr "" -#: config/tc-h8500.c:842 config/tc-sh.c:1155 +#: config/tc-h8500.c:842 config/tc-sh.c:1353 #, c-format msgid "unhandled %d\n" msgstr "" -#: config/tc-h8500.c:870 config/tc-sh.c:1180 +#: config/tc-h8500.c:870 config/tc-sh.c:1378 #, c-format msgid "operand must be absolute in range %d..%d" msgstr "" -#: config/tc-h8500.c:959 config/tc-sh.c:1378 +#: config/tc-h8500.c:959 config/tc-sh.c:1576 #, c-format msgid "failed for %d\n" msgstr "" -#: config/tc-h8500.c:1124 config/tc-sh.c:1479 config/tc-sh.c:1724 +#: config/tc-h8500.c:1124 config/tc-sh.c:1677 config/tc-sh.c:1922 #: config/tc-w65.c:758 msgid "invalid operands for opcode" msgstr "" @@ -3916,24 +3916,24 @@ msgid "" " -xdebug\t\t debug dependency violation checker\n" msgstr "" -#: config/tc-ia64.c:5934 +#: config/tc-ia64.c:5957 msgid "Explicit stops are ignored in auto mode" msgstr "" -#: config/tc-ia64.c:5980 +#: config/tc-ia64.c:6003 msgid "Found '{' after explicit switch to automatic mode" msgstr "" -#: config/tc-ia64.c:7491 +#: config/tc-ia64.c:7514 #, c-format msgid "Unrecognized dependency specifier %d\n" msgstr "" -#: config/tc-ia64.c:8246 +#: config/tc-ia64.c:8269 msgid "Only the first path encountering the conflict is reported" msgstr "" -#: config/tc-ia64.c:8249 +#: config/tc-ia64.c:8272 msgid "This is the location of the conflicting usage" msgstr "" @@ -4068,7 +4068,7 @@ msgid "" "is this intentional ?" msgstr "" -#: config/tc-m32r.c:1260 config/tc-ppc.c:1455 config/tc-ppc.c:3673 read.c:1366 +#: config/tc-m32r.c:1260 config/tc-ppc.c:1456 config/tc-ppc.c:3674 read.c:1366 msgid "Expected comma after symbol-name: rest of line ignored." msgstr "" @@ -4077,12 +4077,12 @@ msgstr "" msgid ".SCOMMon length (%ld.) <0! Ignored." msgstr "" -#: config/tc-m32r.c:1284 config/tc-ppc.c:1477 config/tc-ppc.c:2384 -#: config/tc-ppc.c:3697 +#: config/tc-m32r.c:1284 config/tc-ppc.c:1478 config/tc-ppc.c:2385 +#: config/tc-ppc.c:3698 msgid "ignoring bad alignment" msgstr "" -#: config/tc-m32r.c:1311 config/tc-ppc.c:1488 config/tc-ppc.c:3709 read.c:1390 +#: config/tc-m32r.c:1311 config/tc-ppc.c:1489 config/tc-ppc.c:3710 read.c:1390 #: read.c:2116 #, c-format msgid "Ignoring attempt to re-define symbol `%s'." @@ -5084,7 +5084,7 @@ msgstr "" msgid "pc-relative" msgstr "" -#: config/tc-mcore.c:2421 config/tc-pj.c:569 config/tc-sh.c:3108 +#: config/tc-mcore.c:2421 config/tc-pj.c:569 config/tc-sh.c:3407 #, c-format msgid "Cannot represent relocation type %s" msgstr "" @@ -5624,7 +5624,7 @@ msgid "" "none yet\n" msgstr "" -#: config/tc-mn10200.c:807 config/tc-mn10300.c:957 config/tc-ppc.c:1732 +#: config/tc-mn10200.c:807 config/tc-mn10300.c:957 config/tc-ppc.c:1733 #: config/tc-v850.c:1733 #, c-format msgid "Unrecognized opcode: `%s'" @@ -5832,28 +5832,28 @@ msgid "" "-big\t\t\tgenerate big endian code\n" msgstr "" -#: config/tc-pj.c:458 config/tc-sh.c:2691 config/tc-sh.c:2698 -#: config/tc-sh.c:2705 config/tc-sh.c:2712 +#: config/tc-pj.c:458 config/tc-sh.c:2950 config/tc-sh.c:2957 +#: config/tc-sh.c:2964 config/tc-sh.c:2971 msgid "pcrel too far" msgstr "" -#: config/tc-pj.c:526 config/tc-sh.c:2765 +#: config/tc-pj.c:526 config/tc-sh.c:3062 msgid "offset out of range" msgstr "" -#: config/tc-ppc.c:922 +#: config/tc-ppc.c:923 #, c-format msgid "invalid switch -m%s" msgstr "" -#: config/tc-ppc.c:959 +#: config/tc-ppc.c:960 msgid "" "PowerPC options:\n" "-u\t\t\tignored\n" "-mpwrx, -mpwr2\t\tgenerate code for IBM POWER/2 (RIOS2)\n" "-mpwr\t\t\tgenerate code for IBM POWER (RIOS1)\n" "-m601\t\t\tgenerate code for Motorola PowerPC 601\n" -"-mppc, -mppc32, -m403, -m603, -m604\n" +"-mppc, -mppc32, -m403, -m405, -m603, -m604\n" "\t\t\tgenerate code for Motorola PowerPC 603/604\n" "-mppc64, -m620\t\tgenerate code for Motorola PowerPC 620\n" "-mppc64bridge\t\tgenerate code for PowerPC 64, including bridge insns\n" @@ -5863,7 +5863,7 @@ msgid "" "-mno-regnames\t\tDo not allow symbolic names for registers\n" msgstr "" -#: config/tc-ppc.c:974 +#: config/tc-ppc.c:975 msgid "" "-mrelocatable\t\tsupport for GCC's -mrelocatble option\n" "-mrelocatable-lib\tsupport for GCC's -mrelocatble-lib option\n" @@ -5877,305 +5877,305 @@ msgid "" "-Qy, -Qn\t\tignored\n" msgstr "" -#: config/tc-ppc.c:1009 +#: config/tc-ppc.c:1010 #, c-format msgid "Unknown default cpu = %s, os = %s" msgstr "" -#: config/tc-ppc.c:1034 +#: config/tc-ppc.c:1035 msgid "Neither Power nor PowerPC opcodes were selected." msgstr "" -#: config/tc-ppc.c:1113 +#: config/tc-ppc.c:1114 #, c-format msgid "Internal assembler error for instruction %s" msgstr "" -#: config/tc-ppc.c:1132 +#: config/tc-ppc.c:1133 #, c-format msgid "Internal assembler error for macro %s" msgstr "" -#: config/tc-ppc.c:1342 +#: config/tc-ppc.c:1343 msgid "identifier+constant@got means identifier@got+constant" msgstr "" -#: config/tc-ppc.c:1396 +#: config/tc-ppc.c:1397 config/tc-sh.c:343 config/tc-sh.c:371 #, c-format msgid "%s relocations do not fit in %d bytes\n" msgstr "" -#: config/tc-ppc.c:1496 +#: config/tc-ppc.c:1497 #, c-format msgid "Length of .lcomm \"%s\" is already %ld. Not changed to %ld." msgstr "" -#: config/tc-ppc.c:1578 +#: config/tc-ppc.c:1579 msgid "Relocation cannot be done when using -mrelocatable" msgstr "" -#: config/tc-ppc.c:1659 +#: config/tc-ppc.c:1660 #, c-format msgid "syntax error: invalid toc specifier `%s'" msgstr "" -#: config/tc-ppc.c:1673 +#: config/tc-ppc.c:1674 #, c-format msgid "syntax error: expected `]', found `%c'" msgstr "" -#: config/tc-ppc.c:1908 +#: config/tc-ppc.c:1909 msgid "[tocv] symbol is not a toc symbol" msgstr "" -#: config/tc-ppc.c:1919 +#: config/tc-ppc.c:1920 msgid "Unimplemented toc32 expression modifier" msgstr "" -#: config/tc-ppc.c:1924 +#: config/tc-ppc.c:1925 msgid "Unimplemented toc64 expression modifier" msgstr "" -#: config/tc-ppc.c:1928 +#: config/tc-ppc.c:1929 #, c-format msgid "Unexpected return value [%d] from parse_toc_entry!\n" msgstr "" -#: config/tc-ppc.c:2081 +#: config/tc-ppc.c:2082 #, c-format msgid "syntax error; found `%c' but expected `%c'" msgstr "" -#: config/tc-ppc.c:2189 +#: config/tc-ppc.c:2190 msgid "wrong number of operands" msgstr "" -#: config/tc-ppc.c:2245 +#: config/tc-ppc.c:2246 msgid "Bad .section directive: want a,w,x,e in string" msgstr "" -#: config/tc-ppc.c:2359 +#: config/tc-ppc.c:2360 msgid "missing size" msgstr "" -#: config/tc-ppc.c:2368 +#: config/tc-ppc.c:2369 msgid "negative size" msgstr "" -#: config/tc-ppc.c:2409 +#: config/tc-ppc.c:2410 msgid "missing real symbol name" msgstr "" -#: config/tc-ppc.c:2430 +#: config/tc-ppc.c:2431 msgid "attempt to redefine symbol" msgstr "" -#: config/tc-ppc.c:2664 +#: config/tc-ppc.c:2665 msgid "The XCOFF file format does not support arbitrary sections" msgstr "" -#: config/tc-ppc.c:2772 config/tc-ppc.c:3297 read.c:3000 +#: config/tc-ppc.c:2773 config/tc-ppc.c:3298 read.c:3000 msgid "missing value" msgstr "" -#: config/tc-ppc.c:2790 +#: config/tc-ppc.c:2791 msgid "illegal .stabx expression; zero assumed" msgstr "" -#: config/tc-ppc.c:2822 +#: config/tc-ppc.c:2823 msgid "missing class" msgstr "" -#: config/tc-ppc.c:2831 +#: config/tc-ppc.c:2832 msgid "missing type" msgstr "" -#: config/tc-ppc.c:2892 +#: config/tc-ppc.c:2893 msgid "missing symbol name" msgstr "" -#: config/tc-ppc.c:3068 +#: config/tc-ppc.c:3069 msgid "nested .bs blocks" msgstr "" -#: config/tc-ppc.c:3101 +#: config/tc-ppc.c:3102 msgid ".es without preceding .bs" msgstr "" -#: config/tc-ppc.c:3289 +#: config/tc-ppc.c:3290 msgid "non-constant byte count" msgstr "" -#: config/tc-ppc.c:3334 +#: config/tc-ppc.c:3335 msgid ".tc not in .toc section" msgstr "" -#: config/tc-ppc.c:3353 +#: config/tc-ppc.c:3354 msgid ".tc with no label" msgstr "" -#: config/tc-ppc.c:3428 +#: config/tc-ppc.c:3429 msgid "No previous section to return to. Directive ignored." msgstr "" #. Section Contents #. unknown -#: config/tc-ppc.c:3847 +#: config/tc-ppc.c:3848 msgid "Unsupported section attribute -- 'a'" msgstr "" -#: config/tc-ppc.c:4037 +#: config/tc-ppc.c:4038 msgid "bad symbol suffix" msgstr "" -#: config/tc-ppc.c:4130 +#: config/tc-ppc.c:4131 msgid "Unrecognized symbol suffix" msgstr "" -#: config/tc-ppc.c:4212 +#: config/tc-ppc.c:4213 msgid "two .function pseudo-ops with no intervening .ef" msgstr "" -#: config/tc-ppc.c:4225 +#: config/tc-ppc.c:4226 msgid ".ef with no preceding .function" msgstr "" -#: config/tc-ppc.c:4353 +#: config/tc-ppc.c:4354 #, c-format msgid "warning: symbol %s has no csect" msgstr "" -#: config/tc-ppc.c:4654 +#: config/tc-ppc.c:4655 msgid "symbol in .toc does not match any .tc" msgstr "" -#: config/tc-ppc.c:4951 +#: config/tc-ppc.c:4952 msgid "unsupported relocation type" msgstr "" -#: config/tc-ppc.c:5013 +#: config/tc-ppc.c:5014 #, c-format msgid "cannot emit PC relative %s relocation against %s" msgstr "" -#: config/tc-ppc.c:5018 +#: config/tc-ppc.c:5019 #, c-format msgid "cannot emit PC relative %s relocation" msgstr "" -#: config/tc-ppc.c:5080 +#: config/tc-ppc.c:5081 msgid "must branch to an address a multiple of 4" msgstr "" -#: config/tc-ppc.c:5084 +#: config/tc-ppc.c:5085 #, c-format msgid "@local or @plt branch destination is too far away, %ld bytes" msgstr "" -#: config/tc-ppc.c:5108 +#: config/tc-ppc.c:5109 #, c-format msgid "Gas failure, reloc value %d\n" msgstr "" -#: config/tc-sh.c:676 +#: config/tc-sh.c:874 msgid "illegal register after @-" msgstr "" -#: config/tc-sh.c:692 +#: config/tc-sh.c:890 msgid "must be @(r0,...)" msgstr "" -#: config/tc-sh.c:708 +#: config/tc-sh.c:906 msgid "syntax error in @(r0,...)" msgstr "" -#: config/tc-sh.c:741 config/tc-sh.c:746 +#: config/tc-sh.c:939 config/tc-sh.c:944 msgid "syntax error in @(disp,[Rn, gbr, pc])" msgstr "" -#: config/tc-sh.c:751 +#: config/tc-sh.c:949 msgid "expecting )" msgstr "" -#: config/tc-sh.c:760 +#: config/tc-sh.c:958 msgid "illegal register after @" msgstr "" -#: config/tc-sh.c:1321 +#: config/tc-sh.c:1519 #, c-format msgid "Invalid register: 'r%d'" msgstr "" -#: config/tc-sh.c:1484 +#: config/tc-sh.c:1682 msgid "insn can't be combined with parallel processing insn" msgstr "" -#: config/tc-sh.c:1491 config/tc-sh.c:1502 +#: config/tc-sh.c:1689 config/tc-sh.c:1700 msgid "multiple movx specifications" msgstr "" -#: config/tc-sh.c:1496 config/tc-sh.c:1523 +#: config/tc-sh.c:1694 config/tc-sh.c:1721 msgid "multiple movy specifications" msgstr "" -#: config/tc-sh.c:1504 +#: config/tc-sh.c:1702 msgid "invalid movx address register" msgstr "" -#: config/tc-sh.c:1510 config/tc-sh.c:1515 +#: config/tc-sh.c:1708 config/tc-sh.c:1713 msgid "invalid movx dsp register" msgstr "" -#: config/tc-sh.c:1532 config/tc-sh.c:1537 +#: config/tc-sh.c:1730 config/tc-sh.c:1735 msgid "invalid movy dsp register" msgstr "" -#: config/tc-sh.c:1541 +#: config/tc-sh.c:1739 msgid "invalid movy address register" msgstr "" -#: config/tc-sh.c:1547 +#: config/tc-sh.c:1745 msgid "dsp immediate shift value not constant" msgstr "" -#: config/tc-sh.c:1554 config/tc-sh.c:1567 +#: config/tc-sh.c:1752 config/tc-sh.c:1765 msgid "multiple parallel processing specifications" msgstr "" -#: config/tc-sh.c:1560 +#: config/tc-sh.c:1758 msgid "multiple condition specifications" msgstr "" -#: config/tc-sh.c:1576 +#: config/tc-sh.c:1774 msgid "insn cannot be combined with pmuls" msgstr "" -#: config/tc-sh.c:1593 +#: config/tc-sh.c:1791 msgid "bad padd / psub pmuls output operand" msgstr "" -#: config/tc-sh.c:1603 +#: config/tc-sh.c:1801 msgid "condition not followed by conditionalizable insn" msgstr "" -#: config/tc-sh.c:1613 +#: config/tc-sh.c:1811 msgid "unrecognized characters at end of parallel processing insn" msgstr "" -#: config/tc-sh.c:1729 +#: config/tc-sh.c:1927 #, c-format msgid "excess operands: '%s'" msgstr "" -#: config/tc-sh.c:1894 +#: config/tc-sh.c:2110 msgid ".uses pseudo-op seen when not relaxing" msgstr "" -#: config/tc-sh.c:1900 +#: config/tc-sh.c:2116 msgid "bad .uses format" msgstr "" -#: config/tc-sh.c:1961 +#: config/tc-sh.c:2177 msgid "" "SH options:\n" "-little\t\t\tgenerate little endian code\n" @@ -6184,63 +6184,63 @@ msgid "" "-dsp\t\t\tenable sh-dsp insns, and disable sh3e / sh4 insns.\n" msgstr "" -#: config/tc-sh.c:1972 config/tc-w65.c:861 +#: config/tc-sh.c:2188 config/tc-w65.c:861 msgid "call to tc_Nout_fix_to_chars \n" msgstr "" -#: config/tc-sh.c:2056 +#: config/tc-sh.c:2272 msgid ".uses does not refer to a local symbol in the same section" msgstr "" -#: config/tc-sh.c:2075 +#: config/tc-sh.c:2291 msgid "can't find fixup pointed to by .uses" msgstr "" -#: config/tc-sh.c:2098 +#: config/tc-sh.c:2314 msgid ".uses target does not refer to a local symbol in the same section" msgstr "" -#: config/tc-sh.c:2195 +#: config/tc-sh.c:2411 #, c-format msgid "at 0x%lx, displacement overflows 12-bit field" msgstr "" -#: config/tc-sh.c:2198 +#: config/tc-sh.c:2414 #, c-format msgid "at 0x%lx, displacement to defined symbol %s overflows 12-bit field" msgstr "" -#: config/tc-sh.c:2202 +#: config/tc-sh.c:2418 #, c-format msgid "at 0x%lx, displacement to undefined symbol %s overflows 12-bit field" msgstr "" -#: config/tc-sh.c:2319 +#: config/tc-sh.c:2535 #, c-format msgid "at 0x%lx, displacement overflows 8-bit field" msgstr "" -#: config/tc-sh.c:2322 +#: config/tc-sh.c:2538 #, c-format msgid "at 0x%lx, displacement to defined symbol %s overflows 8-bit field " msgstr "" -#: config/tc-sh.c:2326 +#: config/tc-sh.c:2542 #, c-format msgid "at 0x%lx, displacement to undefined symbol %s overflows 8-bit field " msgstr "" -#: config/tc-sh.c:2380 +#: config/tc-sh.c:2596 #, c-format msgid "overflow in branch to %s; converted into longer instruction sequence" msgstr "" -#: config/tc-sh.c:2455 config/tc-sh.c:2483 config/tc-sparc.c:4047 +#: config/tc-sh.c:2671 config/tc-sh.c:2699 config/tc-sparc.c:4047 #: config/tc-sparc.c:4066 msgid "misaligned data" msgstr "" -#: config/tc-sh.c:2757 +#: config/tc-sh.c:3054 msgid "misaligned offset" msgstr "" @@ -8027,16 +8027,16 @@ msgstr "" msgid "division by zero" msgstr "" -#: frags.c:87 +#: frags.c:86 #, c-format msgid "Can't extend frag %d. chars" msgstr "" -#: frags.c:175 +#: frags.c:167 msgid "attempt to allocate data in absolute section" msgstr "" -#: frags.c:181 +#: frags.c:173 msgid "attempt to allocate data in common section" msgstr "" @@ -8125,7 +8125,7 @@ msgid "form COL= needs absolute expresssion.\n" msgstr "" #. Turns the next expression into a string. -#: gasp.c:1565 macro.c:384 +#: gasp.c:1565 macro.c:387 #, c-format msgid "% operator needs absolute expression" msgstr "" @@ -8373,11 +8373,11 @@ msgstr "" #. same as the one used by input_scrub_new_file(), if that is #. not true, then this code will fail]. #. -#. If we are reading from stdin, then we need to save each input line -#. here (assuming of course that we actually have a line of input to read), -#. so that it can be displayed in the listing that is produced at the end -#. of the assembly. -#: input-file.c:150 input-scrub.c:239 listing.c:353 +#. If we are reading from stdin, then we need to save each input +#. line here (assuming of course that we actually have a line of +#. input to read), so that it can be displayed in the listing +#. that is produced at the end of the assembly. +#: input-file.c:150 input-scrub.c:239 listing.c:348 msgid "{standard input}" msgstr "" @@ -8412,65 +8412,65 @@ msgstr "" msgid "Unable to allocate memory for new instructions\n" msgstr "" -#: listing.c:252 +#: listing.c:247 msgid "Warning:" msgstr "" -#: listing.c:259 +#: listing.c:254 msgid "Error:" msgstr "" -#: listing.c:1145 +#: listing.c:1128 #, c-format msgid "can't open list file: %s" msgstr "" -#: listing.c:1169 +#: listing.c:1152 #, c-format msgid "error closing list file: %s" msgstr "" -#: listing.c:1250 +#: listing.c:1231 msgid "strange paper height, set to no form" msgstr "" -#: listing.c:1316 +#: listing.c:1297 msgid "New line in title" msgstr "" -#: macro.c:547 +#: macro.c:550 msgid "unexpected end of file in macro definition" msgstr "" -#: macro.c:556 +#: macro.c:559 msgid "missing ) after formals" msgstr "" -#: macro.c:713 +#: macro.c:716 msgid "missplaced )" msgstr "" -#: macro.c:975 +#: macro.c:978 msgid "confusion in formal parameters" msgstr "" -#: macro.c:980 +#: macro.c:983 msgid "macro formal argument does not exist" msgstr "" -#: macro.c:995 +#: macro.c:998 msgid "can't mix positional and keyword arguments" msgstr "" -#: macro.c:1003 +#: macro.c:1006 msgid "too many positional arguments" msgstr "" -#: macro.c:1183 +#: macro.c:1186 msgid "unexpected end of file in irp or irpc" msgstr "" -#: macro.c:1191 +#: macro.c:1194 msgid "missing model parameter" msgstr "" diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 48cd1d78822..8482dcb2657 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,10 @@ +2000-09-02 Nick Clifton + + * configure.in: Increase version number to 2.10.91. + * configure: Regenerate. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + 2000-08-31 Alexandre Oliva * acinclude.m4: Include libtool and gettext macros from the diff --git a/gprof/Makefile.in b/gprof/Makefile.in index 7880de88e78..afdc4fc3adb 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -67,6 +67,8 @@ AS = @AS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ @@ -86,10 +88,12 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -151,10 +155,13 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -gprof_OBJECTS = basic_blocks.o call_graph.o cg_arcs.o cg_dfn.o \ -cg_print.o corefile.o gmon_io.o gprof.o hertz.o hist.o source.o \ -search_list.o symtab.o sym_ids.o utils.o i386.o alpha.o vax.o tahoe.o \ -sparc.o flat_bl.o bsd_callg_bl.o fsf_callg_bl.o +gprof_OBJECTS = basic_blocks.$(OBJEXT) call_graph.$(OBJEXT) \ +cg_arcs.$(OBJEXT) cg_dfn.$(OBJEXT) cg_print.$(OBJEXT) \ +corefile.$(OBJEXT) gmon_io.$(OBJEXT) gprof.$(OBJEXT) hertz.$(OBJEXT) \ +hist.$(OBJEXT) source.$(OBJEXT) search_list.$(OBJEXT) symtab.$(OBJEXT) \ +sym_ids.$(OBJEXT) utils.$(OBJEXT) i386.$(OBJEXT) alpha.$(OBJEXT) \ +vax.$(OBJEXT) tahoe.$(OBJEXT) sparc.$(OBJEXT) flat_bl.$(OBJEXT) \ +bsd_callg_bl.$(OBJEXT) fsf_callg_bl.$(OBJEXT) gprof_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -173,19 +180,19 @@ NROFF = nroff HEADERS = $(noinst_HEADERS) DIST_COMMON = ./stamp-h.in ChangeLog Makefile.am Makefile.in TODO \ -aclocal.m4 configure configure.in gconfig.in +acinclude.m4 aclocal.m4 configure configure.in gconfig.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(gprof_SOURCES) OBJECTS = $(gprof_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .dvi .info .lo .m .o .ps .s .texi .texinfo .txi +.SUFFIXES: .S .c .dvi .info .lo .m .o .obj .ps .s .texi .texinfo .txi $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -193,7 +200,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -257,6 +264,11 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -265,6 +277,7 @@ uninstall-binPROGRAMS: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: diff --git a/gprof/aclocal.m4 b/gprof/aclocal.m4 index ec952ca69a0..373c13c9b33 100644 --- a/gprof/aclocal.m4 +++ b/gprof/aclocal.m4 @@ -140,6 +140,351 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) +# This file is derived from `gettext.m4'. The difference is that the +# included macros assume Cygnus-style source and build trees. + +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 3 + +AC_DEFUN(CY_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define as 1 if you have gettext and don't want to use GNU gettext.]) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + dnl In the standard gettext, we would now check for catgets. + dnl However, we never want to use catgets for our releases. + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/../intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(CY_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function]) + fi + + AM_LC_MESSAGES + CY_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + if test -f $srcdir/po2tbl.sed.in; then + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/po2tbl.sed.in > po2tbl.sed + fi + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. But only do this if the po directory + dnl exists in srcdir. + if test -d $srcdir/po; then + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + fi + ]) + +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) + # Add --enable-maintainer-mode option to configure. # From Jim Meyering diff --git a/gprof/configure b/gprof/configure index 7c47f403e7d..0e927ceea46 100755 --- a/gprof/configure +++ b/gprof/configure @@ -865,7 +865,7 @@ fi PACKAGE=gprof -VERSION=2.10.90 +VERSION=2.10.91 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/gprof/configure.in b/gprof/configure.in index 2ab72a60913..1d7984e4ef9 100644 --- a/gprof/configure.in +++ b/gprof/configure.in @@ -4,7 +4,7 @@ AC_INIT(gprof.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(gprof, 2.10.90) +AM_INIT_AUTOMAKE(gprof, 2.10.91) AM_PROG_LIBTOOL diff --git a/gprof/gconfig.in b/gprof/gconfig.in index b528f4be885..7fafbe24c08 100644 --- a/gprof/gconfig.in +++ b/gprof/gconfig.in @@ -112,6 +112,18 @@ /* Define if you have the header file. */ #undef HAVE_VALUES_H +/* Define if you have the stpcpy function */ +#undef HAVE_STPCPY + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if NLS is requested */ +#undef ENABLE_NLS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + /* Name of package */ #undef PACKAGE diff --git a/ld/ChangeLog b/ld/ChangeLog index e13daf942a1..a74cfda3568 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2000-09-02 Nick Clifton + + * configure.in: Increase version number to 2.10.91. + * NEWS: Mention new ability to support removal of duplicate DWARF2 + debug information. + * configure: Regenerate. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + 2000-09-02 Daniel Berlin * scripttempl/elf.sc: Add .gnu.linkonce.wi.* to .debug_info diff --git a/ld/NEWS b/ld/NEWS index b13b66e2276..2bcfda45b31 100644 --- a/ld/NEWS +++ b/ld/NEWS @@ -1,4 +1,9 @@ -*- text -*- +* Support added for eliminating duplicate DWARF2 debug information by + having the compiler generate the information in sections called + .gnu.linkonce.wi.XXXX where XXXX is a checksum for the contents. The + linker then merges these sections together into the normal .debug_info + section. * The native ELF linker now searches the directories in DT_RUNPATH or DT_RPATH of a shared library for shared libraries needed by it. diff --git a/ld/aclocal.m4 b/ld/aclocal.m4 index b468950d71e..903702b3ef1 100644 --- a/ld/aclocal.m4 +++ b/ld/aclocal.m4 @@ -142,6 +142,351 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) +# This file is derived from `gettext.m4'. The difference is that the +# included macros assume Cygnus-style source and build trees. + +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 3 + +AC_DEFUN(CY_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define as 1 if you have gettext and don't want to use GNU gettext.]) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + dnl In the standard gettext, we would now check for catgets. + dnl However, we never want to use catgets for our releases. + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/../intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=libintl.h + nls_cv_header_libgt=libgettext.h + fi + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(CY_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function]) + fi + + AM_LC_MESSAGES + CY_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + if test -f $srcdir/po2tbl.sed.in; then + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/po2tbl.sed.in > po2tbl.sed + fi + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. But only do this if the po directory + dnl exists in srcdir. + if test -d $srcdir/po; then + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + fi + ]) + +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) + dnl AM_PROG_LEX dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT diff --git a/ld/config.in b/ld/config.in index 5e17bdcfbfd..cc9314302aa 100644 --- a/ld/config.in +++ b/ld/config.in @@ -133,6 +133,18 @@ /* Define if you have the header file. */ #undef HAVE_VALUES_H +/* Define if you have the stpcpy function */ +#undef HAVE_STPCPY + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if NLS is requested */ +#undef ENABLE_NLS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + /* Name of package */ #undef PACKAGE diff --git a/ld/configure b/ld/configure index bd2e00b29d1..4e1a55badd2 100755 --- a/ld/configure +++ b/ld/configure @@ -869,7 +869,7 @@ fi PACKAGE=ld -VERSION=2.10.90 +VERSION=2.10.91 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/ld/configure.in b/ld/configure.in index d91d5692b35..9be07de4622 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -5,7 +5,7 @@ AC_INIT(ldmain.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(ld, 2.10.90) +AM_INIT_AUTOMAKE(ld, 2.10.91) AM_PROG_LIBTOOL diff --git a/opcodes/po/opcodes.pot b/opcodes/po/opcodes.pot index f63ce7406af..0fbdaa0334a 100644 --- a/opcodes/po/opcodes.pot +++ b/opcodes/po/opcodes.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-02 13:34-0700\n" +"POT-Creation-Date: 2000-09-02 13:46-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"