Additional merges to branch for 2.15.
authorDaniel Jacobowitz <drow@false.org>
Fri, 7 May 2004 06:32:35 +0000 (06:32 +0000)
committerDaniel Jacobowitz <drow@false.org>
Fri, 7 May 2004 06:32:35 +0000 (06:32 +0000)
25 files changed:
ChangeLog
Makefile.in
Makefile.tpl
bfd/ChangeLog
bfd/simple.c
gas/ChangeLog
gas/Makefile.am
gas/Makefile.in
gas/aclocal.m4
gas/config/tc-arm.c
gas/config/tc-arm.h
gas/config/tc-s390.c
gas/config/tc-s390.h
gas/doc/Makefile [deleted file]
gas/doc/Makefile.in
gas/doc/as.1
gas/po/Makefile [deleted file]
gas/po/POTFILES [deleted file]
gas/testsuite/ChangeLog
gas/testsuite/gas/elf/symver.d
gas/testsuite/gas/symver/symver0.d
gas/testsuite/gas/symver/symver1.d
ld/ld.1
opcodes/ChangeLog
opcodes/ppc-opc.c

index 7c11d60..f054da6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-06  Daniel Jacobowitz  <dan@debian.org>
+
+       * src-release (do-tar): Add directories to the tar file.
+
+2004-05-06  Daniel Jacobowitz  <dan@debian.org>
+
+       Merge from mainline:
+       2004-04-15  James E Wilson  <wilson@specifixinc.com>
+       * Makefile.tpl (configure-[+module+], configure-gcc,
+       configure-stage1-gcc, configure-stage2-gcc, configure-stage3-gcc):
+       Set and export LDFLAGS.
+       * Makefile.in: Regenerate.
+
 2004-04-19  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * configure.in (mips*-*-irix5*): Enable ld.
index 061a76f..2acda01 100644 (file)
@@ -17897,6 +17897,7 @@ configure-ash:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -17964,6 +17965,7 @@ configure-autoconf:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18031,6 +18033,7 @@ configure-automake:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18098,6 +18101,7 @@ configure-bash:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18165,6 +18169,7 @@ configure-bfd:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18232,6 +18237,7 @@ configure-opcodes:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18299,6 +18305,7 @@ configure-binutils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18366,6 +18373,7 @@ configure-bison:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18436,6 +18444,7 @@ configure-byacc:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18506,6 +18515,7 @@ configure-bzip2:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18573,6 +18583,7 @@ configure-dejagnu:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18640,6 +18651,7 @@ configure-diff:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18707,6 +18719,7 @@ configure-dosutils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18770,6 +18783,7 @@ configure-etc:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18837,6 +18851,7 @@ configure-fastjar:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18907,6 +18922,7 @@ configure-fileutils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -18974,6 +18990,7 @@ configure-findutils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19041,6 +19058,7 @@ configure-find:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19108,6 +19126,7 @@ configure-flex:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19178,6 +19197,7 @@ configure-gas:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19245,6 +19265,7 @@ configure-gawk:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19312,6 +19333,7 @@ configure-gettext:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19379,6 +19401,7 @@ configure-gnuserv:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19446,6 +19469,7 @@ configure-gprof:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19513,6 +19537,7 @@ configure-gzip:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19580,6 +19605,7 @@ configure-hello:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19647,6 +19673,7 @@ configure-indent:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19714,6 +19741,7 @@ configure-intl:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19781,6 +19809,7 @@ configure-tcl:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19848,6 +19877,7 @@ configure-itcl:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19915,6 +19945,7 @@ configure-ld:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -19982,6 +20013,7 @@ configure-libgui:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20049,6 +20081,7 @@ configure-libiberty:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20116,6 +20149,7 @@ configure-libtool:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20183,6 +20217,7 @@ configure-m4:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20250,6 +20285,7 @@ configure-make:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20317,6 +20353,7 @@ configure-mmalloc:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20380,6 +20417,7 @@ configure-patch:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20447,6 +20485,7 @@ configure-perl:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20514,6 +20553,7 @@ configure-prms:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20581,6 +20621,7 @@ configure-rcs:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20648,6 +20689,7 @@ configure-readline:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20715,6 +20757,7 @@ configure-release:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20774,6 +20817,7 @@ configure-recode:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20841,6 +20885,7 @@ configure-sed:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20908,6 +20953,7 @@ configure-send-pr:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -20975,6 +21021,7 @@ configure-shellutils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21042,6 +21089,7 @@ configure-sid:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21109,6 +21157,7 @@ configure-sim:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21176,6 +21225,7 @@ configure-tar:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21243,6 +21293,7 @@ configure-texinfo:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21306,6 +21357,7 @@ configure-textutils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21373,6 +21425,7 @@ configure-time:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21440,6 +21493,7 @@ configure-uudecode:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21507,6 +21561,7 @@ configure-wdiff:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21574,6 +21629,7 @@ configure-zip:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21644,6 +21700,7 @@ configure-zlib:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21703,6 +21760,7 @@ configure-gdb:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21770,6 +21828,7 @@ configure-expect:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21837,6 +21896,7 @@ configure-guile:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21904,6 +21964,7 @@ configure-tk:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -21971,6 +22032,7 @@ configure-tix:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -22038,6 +22100,7 @@ configure-libtermcap:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -22101,6 +22164,7 @@ configure-utils:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -23481,6 +23545,7 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
        AS="$(AS_FOR_TARGET)"; export AS; \
        CC="$(CC_FOR_TARGET)"; export CC; \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
        CXX="$(CXX_FOR_TARGET)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -23502,30 +23567,8 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
              *) topdir="../../$(srcdir)" ;; \
            esac ;; \
        esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libada "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
          srcdiroption="--srcdir=$${topdir}/libada"; \
          libsrcdir="$$s/libada"; \
-       fi; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -23594,6 +23637,7 @@ configure-gcc:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -23858,7 +23902,6 @@ ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
 configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
 configure-target-fastjar: maybe-configure-target-zlib
 all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
-configure-target-libada: $(ALL_GCC_C)
 configure-target-libf2c: $(ALL_GCC_C)
 all-target-libf2c: maybe-all-target-libiberty
 configure-target-libffi: $(ALL_GCC_C) 
index c82c818..3a7750c 100644 (file)
@@ -858,6 +858,7 @@ configure-[+module+]:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
@@ -1090,6 +1091,7 @@ configure-gcc:
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
index d2a4bd8..720601d 100644 (file)
@@ -1,3 +1,11 @@
+2004-05-07  Daniel Jacobowitz  <dan@debian.org>
+
+       Merge from mainline:
+       2004-04-16  Alan Modra  <amodra@bigpond.net.au>
+       * simple.c (bfd_simple_get_relocated_section_contents): Don't
+       change reloc_done.  Set and restore _cooked_size.
+       (RETURN): Delete.
+
 2004-05-07  Alexandre Oliva  <aoliva@redhat.com>
 
        * elf32-frv.c (elf32_frvfdpic_modify_segment_map): Return
index 4b597a4..fc2472e 100644 (file)
@@ -1,5 +1,5 @@
 /* simple.c -- BFD simple client routines
-   Copyright 2002, 2003
+   Copyright 2002, 2003, 2004
    Free Software Foundation, Inc.
    Contributed by MontaVista Software, Inc.
 
@@ -140,28 +140,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
   bfd_byte *contents, *data;
   int storage_needed;
   void *saved_offsets;
-  bfd_boolean saved_reloc_done = sec->reloc_done;
-
-#undef RETURN
-#define RETURN(x)                              \
-  do                                           \
-    {                                          \
-      sec->reloc_done = saved_reloc_done;      \
-      return (x);                              \
-    }                                          \
-  while (0)
-
-  /* Foul hack to prevent bfd_section_size aborts.  The reloc_done flag
-     only controls that macro (and the related size macros), selecting
-     between _raw_size and _cooked_size.  We may be called with relocation
-     done or not, so we need to save the done-flag and mark the section as
-     not relocated.
-
-     Debug sections won't change size while we're only relocating.  There
-     may be trouble here someday if it tries to run relaxation
-     unexpectedly, so make sure.  */
-  BFD_ASSERT (sec->_raw_size == sec->_cooked_size);
-  sec->reloc_done = 0;
+  bfd_size_type old_cooked_size;
 
   if (! (sec->flags & SEC_RELOC))
     {
@@ -175,7 +154,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
       if (contents)
        bfd_get_section_contents (abfd, sec, contents, 0, size);
 
-      RETURN (contents);
+      return contents;
     }
 
   /* In order to use bfd_get_relocated_section_contents, we need
@@ -205,7 +184,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
     {
       data = bfd_malloc (bfd_section_size (abfd, sec));
       if (data == NULL)
-       RETURN (NULL);
+       return NULL;
       outbuf = data;
     }
 
@@ -224,7 +203,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
     {
       if (data)
        free (data);
-      RETURN (NULL);
+      return NULL;
     }
   bfd_map_over_sections (abfd, simple_save_output_info, saved_offsets);
 
@@ -239,6 +218,12 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
   else
     storage_needed = 0;
 
+  /* This function might be called before _cooked_size has been set, and
+     bfd_perform_relocation needs _cooked_size to be valid.  */
+  old_cooked_size = sec->_cooked_size;
+  if (old_cooked_size == 0)
+    sec->_cooked_size = sec->_raw_size;
+
   contents = bfd_get_relocated_section_contents (abfd,
                                                 &link_info,
                                                 &link_order,
@@ -262,10 +247,11 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
     free (symbol_table);
 #endif
 
+  sec->_cooked_size = old_cooked_size;
   bfd_map_over_sections (abfd, simple_restore_output_info, saved_offsets);
   free (saved_offsets);
 
   _bfd_generic_link_hash_table_free (link_info.hash);
 
-  RETURN (contents);
+  return contents;
 }
index 5b54c33..02468a8 100644 (file)
@@ -1,3 +1,36 @@
+2004-05-07  Daniel Jacobowitz  <dan@debian.org>
+
+       * Makefile.am (DIST_SUBDIRS): Define.
+       * aclocal.m4: Regenerate with automake 1.8.4.
+       * Makefile.in: Likewise.
+       * doc/Makefile.in: Likewise.
+
+2004-05-07  Daniel Jacobowitz  <dan@debian.org>
+
+       Merge from mainline:
+       2004-05-05  Jakub Jelinek  <jakub@redhat.com>
+       * tc-s390.h (md_do_align, HANDLE_ALIGN): Remove.
+       (NOP_OPCODE): Define.
+       (s390_align_code): Remove prototype.
+       * tc-s390.c (s390_align_code): Remove.
+
+       2004-04-22  Bruno De Bus <bdebus@elis.ugent.be>
+       * config/tc-arm.h (enum mstate): Move here, add MAP_UNDEFINED
+       state.
+       (TC_SEGMENT_INFO_TYPE): Define to enum mstate.
+       * config/tc-arm.c (enum mstate): Delete from here.
+       (mapping_state): Remove the static mapstate variable and instead
+       store the state in the segment.  This allows a per-section mapping
+       state.  Handle and ignore MAP_UNDEFINED states.
+       (arm_elf_change_section): Get the current mapping state from the
+       new section.
+       (s_ltorg): Set the mapping state to MAP_DATA.
+       (arm_cleanup): Use arm_elf_change_section to get the mapping state
+       for each pool as it is emitted.
+
+       2004-04-22  Nick Clifton  <nickc@redhat.com>
+       * config/tc-arm.h: Formatting tidy ups.
+
 2004-05-07  Alexandre Oliva  <aoliva@redhat.com>
 
        * config/tc-frv.h (MAX_MEM_FOR_RS_ALIGN_CODE): New.
index 6b483e9..7728434 100644 (file)
@@ -6,6 +6,9 @@ INTLLIBS = @INTLLIBS@
 AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
 
 SUBDIRS = doc po
+# Automake should figure this out on its own.  It doesn't, because
+# of the "cygnus" option.  But distclean still wants it.
+DIST_SUBDIRS = $(SUBDIRS)
 
 tooldir = $(exec_prefix)/$(target_alias)
 
index b189b7d..67ed432 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -244,6 +244,9 @@ target_vendor = @target_vendor@
 te_file = @te_file@
 AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
 SUBDIRS = doc po
+# Automake should figure this out on its own.  It doesn't, because
+# of the "cygnus" option.  But distclean still wants it.
+DIST_SUBDIRS = $(SUBDIRS)
 tooldir = $(exec_prefix)/$(target_alias)
 AM_CFLAGS = $(WARN_CFLAGS)
 MKDEP = gcc -MM
@@ -2721,10 +2724,12 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
-       if (etags --etags-include --version) >/dev/null 2>&1; then \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
          include_option=--etags-include; \
+         empty_fix=.; \
        else \
          include_option=--include; \
+         empty_fix=; \
        fi; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
@@ -2738,9 +2743,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -z "$$unique" && unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
index 2f89234..c5ef088 100644 (file)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.8.3])])
+        [AM_AUTOMAKE_VERSION([1.8.4])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -266,9 +266,14 @@ AC_CACHE_CHECK([dependency style of $depcc],
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi
index 69b2c21..2ed5196 100644 (file)
@@ -1,5 +1,5 @@
 /* tc-arm.c -- Assemble for the ARM
-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
        Modified by David Taylor (dtaylor@armltd.co.uk)
@@ -2823,13 +2823,6 @@ validate_offset_imm (val, hwse)
 
 \f
 #ifdef OBJ_ELF
-enum mstate
-{
-  MAP_DATA,
-  MAP_ARM,
-  MAP_THUMB
-};
-
 /* This code is to handle mapping symbols as defined in the ARM ELF spec.
    (This text is taken from version B-02 of the spec):
 
@@ -2904,10 +2897,11 @@ enum mstate
    the EABI (which is still under development), so they are not
    implemented here.  */
 
+static enum mstate mapstate = MAP_UNDEFINED;
+
 static void
 mapping_state (enum mstate state)
 {
-  static enum mstate mapstate = MAP_DATA;
   symbolS * symbolP;
   const char * symname;
   int type;
@@ -2933,10 +2927,14 @@ mapping_state (enum mstate state)
       symname = "$t";
       type = BSF_FUNCTION;
       break;
+    case MAP_UNDEFINED:
+      return;     
     default:
       abort ();
     }
 
+  seg_info (now_seg)->tc_segment_info_data = state;
+
   symbolP = symbol_new (symname, now_seg, (valueT) frag_now_fix (), frag_now);
   symbol_table_insert (symbolP);
   symbol_get_bfdsym (symbolP)->flags |= type | BSF_LOCAL;
@@ -2977,16 +2975,7 @@ arm_elf_change_section (void)
   if ((flags & SEC_ALLOC) == 0)
     return;
 
-  if (flags & SEC_CODE)
-    {
-      if (thumb_mode)
-       mapping_state (MAP_THUMB);
-      else
-       mapping_state (MAP_ARM);
-    }
-  else
-    /* This section does not contain code.  Therefore it must contain data.  */
-    mapping_state (MAP_DATA);    
+  mapstate = seg_info (now_seg)->tc_segment_info_data;
 }
 #else
 #define mapping_state(a)
@@ -3109,6 +3098,8 @@ s_ltorg (ignored)
       || pool->next_free_entry == 0)
     return;
 
+  mapping_state (MAP_DATA);
+
   /* Align pool as you have word accesses.
      Only make a frag if we have to.  */
   if (!need_pass_2)
@@ -13817,6 +13808,9 @@ arm_cleanup ()
     {
       /* Put it at the end of the relevent section.  */
       subseg_set (pool->section, pool->sub_section);
+#ifdef OBJ_ELF
+      arm_elf_change_section ();
+#endif
       s_ltorg (0);
     }
 }
index 58396cc..4e791a0 100644 (file)
@@ -1,5 +1,5 @@
 /* This file is tc-arm.h
-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004
    Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
        Modified by David Taylor (dtaylor@armltd.co.uk)
 #define LITTLE_ENDIAN  1234
 #define BIG_ENDIAN     4321
 
-#if defined OBJ_AOUT
-#if defined TE_RISCIX
-# define TARGET_FORMAT "a.out-riscix"
-#elif defined TE_LINUX
-# define ARM_BI_ENDIAN
-# define TARGET_FORMAT "a.out-arm-linux"
-#elif defined TE_NetBSD
-# define TARGET_FORMAT "a.out-arm-netbsd"
-#else
-# define ARM_BI_ENDIAN
-# define TARGET_FORMAT \
-  (target_big_endian ? "a.out-arm-big" : "a.out-arm-little")
-#endif
-#endif /* OBJ_AOUT */
-
-#ifdef OBJ_AIF
-#define TARGET_FORMAT "aif"
-#endif
-
 struct fix;
 
-#if defined OBJ_COFF || defined OBJ_ELF
+#if defined OBJ_AOUT
+# if defined TE_RISCIX
+#  define TARGET_FORMAT "a.out-riscix"
+# elif defined TE_LINUX
+#  define ARM_BI_ENDIAN
+#  define TARGET_FORMAT "a.out-arm-linux"
+# elif defined TE_NetBSD
+#  define TARGET_FORMAT "a.out-arm-netbsd"
+# else
+#  define ARM_BI_ENDIAN
+#  define TARGET_FORMAT (target_big_endian ? "a.out-arm-big" : "a.out-arm-little")
+# endif
+#elif defined OBJ_AIF
+# define TARGET_FORMAT "aif"
+#elif defined OBJ_COFF
 # define ARM_BI_ENDIAN
-
-# define TC_VALIDATE_FIX(FIX, SEGTYPE, LABEL) arm_validate_fix (FIX)
-  extern void arm_validate_fix PARAMS ((struct fix *));
-#endif
-
-#ifdef OBJ_COFF
 # if defined TE_PE
-#   ifdef TE_EPOC
-#    define TARGET_FORMAT (target_big_endian ? "epoc-pe-arm-big" : "epoc-pe-arm-little")
-#   else
-#    define TARGET_FORMAT (target_big_endian ? "pe-arm-big" : "pe-arm-little")
-#   endif
+#  if defined TE_EPOC
+#   define TARGET_FORMAT (target_big_endian ? "epoc-pe-arm-big" : "epoc-pe-arm-little")
+#  else
+#   define TARGET_FORMAT (target_big_endian ? "pe-arm-big" : "pe-arm-little")
+#  endif
 # else
 #  define TARGET_FORMAT (target_big_endian ? "coff-arm-big" : "coff-arm-little")
 # endif
-#endif
-
-#ifdef OBJ_ELF
-# define TARGET_FORMAT elf32_arm_target_format()
-  extern const char * elf32_arm_target_format PARAMS ((void));
-
-# define md_elf_section_change_hook() arm_elf_change_section
-  extern void arm_elf_change_section (void);
+#elif defined OBJ_ELF
+# define ARM_BI_ENDIAN
+# define TARGET_FORMAT elf32_arm_target_format ()
 #endif
 
 #define TC_FORCE_RELOCATION(FIX) arm_force_relocation (FIX)
-extern int arm_force_relocation PARAMS ((struct fix *));
 
-#define md_convert_frag(b, s, f) {as_fatal (_("arm convert_frag\n"));}
+#define md_convert_frag(b, s, f) { as_fatal (_("arm convert_frag\n")); }
 
 #define md_cleanup() arm_cleanup ()
- extern void arm_cleanup PARAMS ((void));
 
 #define md_start_line_hook() arm_start_line_hook ()
- extern void arm_start_line_hook PARAMS ((void));
 
 #define tc_frob_label(S) arm_frob_label (S)
- extern void arm_frob_label PARAMS ((symbolS *));
 
 /* We also need to mark assembler created symbols:  */
 #define tc_frob_fake_label(S) arm_frob_label (S)
@@ -119,19 +99,9 @@ extern int arm_force_relocation PARAMS ((struct fix *));
 #define TC_FIX_TYPE PTR
 #define TC_INIT_FIX_DATA(FIX) ((FIX)->tc_fix_data = NULL)
 
-#if defined OBJ_ELF || defined OBJ_COFF
-#define EXTERN_FORCE_RELOC 1
-
-#define tc_fix_adjustable(FIX) arm_fix_adjustable (FIX)
-bfd_boolean arm_fix_adjustable PARAMS ((struct fix *));
-
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
-#define MD_APPLY_SYM_VALUE(FIX) 0
-#endif
-
 /* We need to keep some local information on symbols.  */
 
-#define TC_SYMFIELD_TYPE unsigned int
+#define TC_SYMFIELD_TYPE       unsigned int
 #define ARM_GET_FLAG(s)        (*symbol_get_tc (s))
 #define ARM_SET_FLAG(s,v)      (*symbol_get_tc (s) |= (v))
 #define ARM_RESET_FLAG(s,v)    (*symbol_get_tc (s) &= ~(v))
@@ -148,23 +118,10 @@ bfd_boolean arm_fix_adjustable PARAMS ((struct fix *));
 #define ARM_SET_INTERWORK(s,t)  ((t) ? ARM_SET_FLAG (s, ARM_FLAG_INTERWORK) : ARM_RESET_FLAG (s, ARM_FLAG_INTERWORK))
 #define THUMB_SET_FUNC(s,t)     ((t) ? ARM_SET_FLAG (s, THUMB_FLAG_FUNC)    : ARM_RESET_FLAG (s, THUMB_FLAG_FUNC))
 
-#define TC_START_LABEL(C,STR) \
-  (c == ':' || (c == '/' && arm_data_in_code ()))
-int arm_data_in_code PARAMS ((void));
-
-#define tc_canonicalize_symbol_name(str) \
- arm_canonicalize_symbol_name (str);
-char * arm_canonicalize_symbol_name PARAMS ((char *));
-
-#define obj_adjust_symtab() arm_adjust_symtab ()
- extern void arm_adjust_symtab PARAMS ((void));
-
-#ifdef OBJ_ELF
-#define obj_frob_symbol(sym, punt)  armelf_frob_symbol ((sym), & (punt))
-void armelf_frob_symbol PARAMS ((symbolS *, int *));
-#endif
-
-#define tc_aout_pre_write_hook(x)      {;}     /* not used */
+#define TC_START_LABEL(C,STR)            (c == ':' || (c == '/' && arm_data_in_code ()))
+#define tc_canonicalize_symbol_name(str) arm_canonicalize_symbol_name (str);
+#define obj_adjust_symtab()             arm_adjust_symtab ()
+#define tc_aout_pre_write_hook(x)       {;}    /* not used */
 
 #define LISTING_HEADER "ARM GAS "
 
@@ -172,9 +129,6 @@ void armelf_frob_symbol PARAMS ((symbolS *, int *));
 
 #define LOCAL_LABEL(name) (name[0] == '.' && (name[1] == 'L'))
 #define LOCAL_LABELS_FB   1
-#ifdef OBJ_ELF
-#define LOCAL_LABEL_PREFIX '.'
-#endif
 
 /* This expression evaluates to true if the relocation is for a local
    object for which we still want to do the relocation at runtime.
@@ -192,29 +146,15 @@ void armelf_frob_symbol PARAMS ((symbolS *, int *));
    || TC_FORCE_RELOCATION (FIX))
 
 #define TC_CONS_FIX_NEW cons_fix_new_arm
- extern void cons_fix_new_arm PARAMS ((fragS *, int, int, expressionS *));
-
-#ifdef OBJ_ELF
-#define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
-#else
-#define GLOBAL_OFFSET_TABLE_NAME "__GLOBAL_OFFSET_TABLE_"
-#endif
-
-#ifdef OBJ_ELF
-#define DWARF2_LINE_MIN_INSN_LENGTH 2
-#endif
 
 #define MAX_MEM_FOR_RS_ALIGN_CODE 31
 
 /* For frags in code sections we need to record whether they contain
    ARM code or THUMB code.  This is that if they have to be aligned,
    they can contain the correct type of no-op instruction.  */
-#define TC_FRAG_TYPE   int
+#define TC_FRAG_TYPE           int
 #define TC_FRAG_INIT(fragp)    arm_init_frag (fragp)
-extern void arm_init_frag PARAMS ((struct frag *));
-
-#define HANDLE_ALIGN(fragp) arm_handle_align (fragp)
-extern void arm_handle_align PARAMS ((struct frag *));
+#define HANDLE_ALIGN(fragp)    arm_handle_align (fragp)
 
 #define md_do_align(N, FILL, LEN, MAX, LABEL)                                  \
   if (FILL == NULL && (N) != 0 && ! need_pass_2 && subseg_text_p (now_seg))    \
@@ -222,4 +162,50 @@ extern void arm_handle_align PARAMS ((struct frag *));
       arm_frag_align_code (N, MAX);                                            \
       goto LABEL;                                                              \
     }
-extern void arm_frag_align_code PARAMS ((int, int));
+
+#ifdef OBJ_ELF
+# define DWARF2_LINE_MIN_INSN_LENGTH   2
+# define obj_frob_symbol(sym, punt)    armelf_frob_symbol ((sym), & (punt))
+# define md_elf_section_change_hook()  arm_elf_change_section ()
+# define GLOBAL_OFFSET_TABLE_NAME      "_GLOBAL_OFFSET_TABLE_"
+# define LOCAL_LABEL_PREFIX            '.'
+# define TC_SEGMENT_INFO_TYPE          enum mstate
+
+enum mstate
+{
+  MAP_UNDEFINED = 0, /* Must be zero, for seginfo in new sections.  */
+  MAP_DATA,
+  MAP_ARM,
+  MAP_THUMB
+};
+
+#else /* Not OBJ_ELF.  */
+#define GLOBAL_OFFSET_TABLE_NAME "__GLOBAL_OFFSET_TABLE_"
+#endif
+
+#if defined OBJ_ELF || defined OBJ_COFF
+
+# define EXTERN_FORCE_RELOC                    1
+# define tc_fix_adjustable(FIX)                arm_fix_adjustable (FIX)
+/* Values passed to md_apply_fix3 don't include the symbol value.  */
+# define MD_APPLY_SYM_VALUE(FIX)               0
+# define TC_VALIDATE_FIX(FIX, SEGTYPE, LABEL)  arm_validate_fix (FIX)
+
+#endif
+
+extern void arm_frag_align_code (int, int);
+extern void arm_validate_fix (struct fix *);
+extern const char * elf32_arm_target_format (void);
+extern void arm_elf_change_section (void);
+extern int arm_force_relocation (struct fix *);
+extern void arm_cleanup (void);
+extern void arm_start_line_hook (void);
+extern void arm_frob_label (symbolS *);
+extern int arm_data_in_code (void);
+extern char * arm_canonicalize_symbol_name (char *);
+extern void arm_adjust_symtab (void);
+extern void armelf_frob_symbol (symbolS *, int *);
+extern void cons_fix_new_arm (fragS *, int, int, expressionS *);
+extern void arm_init_frag (struct frag *);
+extern void arm_handle_align (struct frag *);
+extern bfd_boolean arm_fix_adjustable (struct fix *);
index c450eae..4fafbec 100644 (file)
@@ -1,5 +1,5 @@
 /* tc-s390.c -- Assemble for the S390
-   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of GAS, the GNU Assembler.
@@ -540,19 +540,6 @@ s390_md_end ()
     bfd_set_arch_mach (stdoutput, bfd_arch_s390, bfd_mach_s390_31);
 }
 
-void
-s390_align_code (fragP, count)
-     fragS *fragP;
-     int count;
-{
-  /* We use nop pattern 0x0707.  */
-  if (count > 0)
-    {
-      memset (fragP->fr_literal + fragP->fr_fix, 0x07, count);
-      fragP->fr_var = count;
-    }
-}
-
 /* Insert an operand value into an instruction.  */
 
 static void
index a416927..fe55e15 100644 (file)
@@ -1,5 +1,5 @@
 /* tc-s390.h -- Header file for tc-s390.c.
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
    Written by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of GAS, the GNU Assembler.
@@ -76,23 +76,7 @@ extern int target_big_endian;
 
 #define md_number_to_chars           number_to_chars_bigendian
 
-#define md_do_align(n, fill, len, max, around)                          \
-if ((n) && !need_pass_2 && (fill == 0) &&                               \
-    (bfd_get_section_flags (stdoutput, now_seg) & SEC_CODE) != 0) {     \
-  char *p;                                                              \
-  p = frag_var (rs_align_code, 15, 1, (relax_substateT) max,            \
-                (symbolS *) 0, (offsetT) (n), (char *) 0);              \
-  *p = 0x07;                                                            \
-  goto around;                                                          \
-}
-
-extern void s390_align_code PARAMS ((fragS *, int));
-
-#define HANDLE_ALIGN(fragP)                                            \
-if (fragP->fr_type == rs_align_code)                                   \
-  s390_align_code (fragP, (fragP->fr_next->fr_address                  \
-                          - fragP->fr_address                          \
-                          - fragP->fr_fix));
+#define NOP_OPCODE 0x07
 
 /* call md_pcrel_from_section, not md_pcrel_from */
 #define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section(FIX, SEC)
diff --git a/gas/doc/Makefile b/gas/doc/Makefile
deleted file mode 100644 (file)
index 02659cf..0000000
+++ /dev/null
@@ -1,608 +0,0 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-# doc/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/gas
-pkglibdir = $(libdir)/gas
-pkgincludedir = $(includedir)/gas
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
-subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/../libtool.m4 $(top_srcdir)/../gettext.m4 \
-       $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-SOURCES =
-DIST_SOURCES =
-INFO_DEPS = $(srcdir)/as.info
-TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
-am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
-DVIS = as.dvi
-PDFS = as.pdf
-PSS = as.ps
-HTMLS = as.html
-TEXINFOS = as.texinfo
-TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \
-             echo $(top_srcdir)/../texinfo/util/texi2dvi; \
-           else \
-             echo texi2dvi; \
-           fi`
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-MAKEINFOHTML = $(MAKEINFO) --html
-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-DVIPS = dvips
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
-NROFF = nroff
-MANS = $(man_MANS)
-ACLOCAL = ${SHELL} /opt/src/binutils/binutils/tst-src/missing --run aclocal-1.8
-ALLOCA = 
-ALL_OBJ_DEPS =  ../bfd/bfd.h $(INCDIR)/symcat.h
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /opt/src/binutils/binutils/tst-src/missing --run tar
-AUTOCONF = ${SHELL} /opt/src/binutils/binutils/tst-src/missing --run autoconf
-AUTOHEADER = ${SHELL} /opt/src/binutils/binutils/tst-src/missing --run autoheader
-AUTOMAKE = ${SHELL} /opt/src/binutils/binutils/tst-src/missing --run automake-1.8
-AWK = gawk
-BFDLIB = ../bfd/libbfd.la
-BFDVER_H = ../bfd/bfdver.h
-CATALOGS =  fr.gmo tr.gmo es.gmo
-CATOBJEXT = .gmo
-CC = gcc
-CCDEPMODE = depmode=none
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CYGPATH_W = echo
-DATADIRNAME = share
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-GDBINIT = .gdbinit
-GMOFILES =  fr.gmo tr.gmo es.gmo
-GMSGFMT = /usr/bin/msgfmt
-GT_NO = 
-GT_YES = #YES#
-INCLUDE_LOCALE_H = #include <locale.h>
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLDEPS = 
-INTLLIBS = 
-INTLOBJS = 
-LDFLAGS = 
-LEX = flex
-LEXLIB = -lfl
-LEX_OUTPUT_ROOT = lex.yy
-LIBM = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /opt/src/binutils/binutils/tst-src/missing --run makeinfo
-MKINSTALLDIRS = $(srcdir)/../../mkinstalldirs
-MSGFMT = /usr/bin/msgfmt
-OBJEXT = o
-OPCODES_LIB = 
-PACKAGE = gas
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-POFILES =  fr.po tr.po es.po
-POSUB = po
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-USE_INCLUDED_LIBINTL = no
-USE_NLS = yes
-VERSION = 2.14.91
-WARN_CFLAGS = -W -Wall -Wstrict-prototypes -Wmissing-prototypes
-XGETTEXT = /usr/bin/xgettext
-YACC = bison -y
-ac_ct_CC = 
-ac_ct_RANLIB = 
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = 
-am__fastdepCC_TRUE = #
-am__include = include
-am__leading_dot = .
-am__quote = 
-atof = ieee
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = i686-pc-linux-gnu
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-cgen_cpu_prefix = 
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-extra_objects = 
-host = i686-pc-linux-gnu
-host_alias = i686-pc-linux-gnu
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /opt/src/binutils/binutils/tst-src/install-sh
-install_tooldir = install-exec-tooldir
-l = 
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p -- .
-obj_format = elf
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,y,y,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = i686-pc-linux-gnu
-target_cpu = i686
-target_cpu_type = i386
-target_os = linux-gnu
-target_vendor = pc
-te_file = linux
-AUTOMAKE_OPTIONS = 1.8 cygnus
-
-# What version of the manual you want; "all" includes everything
-CONFIG = all
-
-# Options to extract the man page from as.texinfo
-MANCONF = -Dman
-TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl
-POD2MAN = pod2man --center="GNU Development Tools" \
-       --release="binutils-$(VERSION)" --section=1
-
-man_MANS = as.1
-info_TEXINFOS = as.texinfo 
-CPU_DOCS = \
-       c-a29k.texi \
-       c-alpha.texi \
-       c-arc.texi \
-       c-arm.texi \
-       c-d10v.texi \
-       c-cris.texi \
-       c-h8300.texi \
-       c-h8500.texi \
-       c-hppa.texi \
-       c-i370.texi \
-       c-i386.texi \
-       c-i860.texi \
-       c-i960.texi \
-       c-ip2k.texi \
-       c-m32r.texi \
-       c-m68hc11.texi \
-       c-m68k.texi \
-       c-m88k.texi \
-       c-mips.texi \
-       c-mmix.texi \
-       c-msp430.texi \
-       c-ns32k.texi \
-       c-pdp11.texi \
-       c-pj.texi \
-       c-ppc.texi \
-       c-sh.texi \
-       c-sh64.texi \
-       c-sparc.texi \
-        c-tic54x.texi \
-       c-vax.texi \
-       c-v850.texi \
-       c-xtensa.texi \
-       c-z8k.texi
-
-
-# This one isn't ready for prime time yet.  Not even a little bit.
-noinst_TEXINFOS = internals.texi
-DISTCLEANFILES = asconfig.texi
-MAINTAINERCLEANFILES = gasver.texi
-BASEDIR = $(srcdir)/../..
-BFDDIR = $(BASEDIR)/bfd
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .dvi .html .info .pdf .ps .texinfo
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
-
-.texinfo.info:
-       restore=: && \
-       backupdir="$(am__leading_dot)am$$$$" && \
-       am__cwd=`pwd` && cd $(srcdir) && \
-       rm -rf $$backupdir && mkdir $$backupdir && \
-       for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-         if test -f $$f; then \
-           mv $$f $$backupdir; \
-           restore=mv; \
-         fi; \
-       done; \
-       cd "$$am__cwd"; \
-       if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-        -o $@ $<; \
-       then \
-         rc=0; \
-         cd $(srcdir); \
-       else \
-         rc=$$?; \
-         cd $(srcdir) && \
-         $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-       fi; \
-       rm -rf $$backupdir; \
-       exit $$rc
-
-.texinfo.dvi:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2DVI) $<
-
-.texinfo.pdf:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2PDF) $<
-
-.texinfo.html:
-       $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-        -o $@ $<
-       if test ! -d $@ && test -d $(@:.html=); then \
-         mv $(@:.html=) $@; else :; fi
-$(srcdir)/as.info: as.texinfo 
-as.pdf: as.texinfo 
-as.html: as.texinfo 
-.dvi.ps:
-       $(DVIPS) -o $@ $<
-
-uninstall-info-am:
-       $(PRE_UNINSTALL)
-       @if (install-info --version && \
-            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-         list='$(INFO_DEPS)'; \
-         for file in $$list; do \
-           relfile=`echo "$$file" | sed 's|^.*/||'`; \
-           echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-           install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
-         done; \
-       else :; fi
-       @$(NORMAL_UNINSTALL)
-       @list='$(INFO_DEPS)'; \
-       for file in $$list; do \
-         relfile=`echo "$$file" | sed 's|^.*/||'`; \
-         relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-         (if cd "$(DESTDIR)$(infodir)"; then \
-            echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
-            rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
-          else :; fi); \
-       done
-
-dist-info: $(INFO_DEPS)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; \
-       for base in $$list; do \
-         case $$base in \
-           $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-         esac; \
-         if test -f $$base; then d=.; else d=$(srcdir); fi; \
-         for file in $$d/$$base*; do \
-           relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-           test -f $(distdir)/$$relfile || \
-             cp -p $$file $(distdir)/$$relfile; \
-         done; \
-       done
-
-mostlyclean-aminfo:
-       -rm -rf as.aux as.cp as.cps as.fn as.fns as.ky as.log as.pg as.pgs as.tmp \
-         as.toc as.tp as.tps as.vr as.vrs as.dvi as.pdf as.ps as.html
-
-maintainer-clean-aminfo:
-       @list='$(INFO_DEPS)'; for i in $$list; do \
-         i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-         echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-         rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
-       done
-
-clean-info: mostlyclean-aminfo
-install-man1: $(man1_MANS) $(man_MANS)
-       @$(NORMAL_INSTALL)
-       test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-       for i in $$l2; do \
-         case "$$i" in \
-           *.1*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-         else file=$$i; fi; \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         case "$$ext" in \
-           1*) ;; \
-           *) ext='1' ;; \
-         esac; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed -e 's/^.*\///'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-         $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-       done
-uninstall-man1:
-       @$(NORMAL_UNINSTALL)
-       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-       for i in $$l2; do \
-         case "$$i" in \
-           *.1*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         case "$$ext" in \
-           1*) ;; \
-           *) ext='1' ;; \
-         esac; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed -e 's/^.*\///'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-         rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-       done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-check-am:
-check: check-am
-all-am: Makefile $(MANS)
-installdirs:
-       for dir in "$(DESTDIR)$(man1dir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -rm -f $(CONFIG_CLEAN_FILES)
-       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am: $(DVIS)
-
-html: html-am
-
-html-am: $(HTMLS)
-
-info-am: $(INFO_DEPS)
-
-install-data-am: install-data-local install-man
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-info-am: $(INFO_DEPS)
-       @$(NORMAL_INSTALL)
-       test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; \
-       for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-         esac; \
-         if test -f $$file; then d=.; else d=$(srcdir); fi; \
-         file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-         for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
-           if test -f $$ifile; then \
-             relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
-             echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
-             $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
-           else : ; fi; \
-         done; \
-       done
-       @$(POST_INSTALL)
-       @if (install-info --version && \
-            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-         list='$(INFO_DEPS)'; \
-         for file in $$list; do \
-           relfile=`echo "$$file" | sed 's|^.*/||'`; \
-           echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-         done; \
-       else : ; fi
-install-man: install-man1
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-       maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am: $(PDFS)
-
-ps: ps-am
-
-ps-am: $(PSS)
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man1
-
-.PHONY: all all-am check check-am clean clean-generic clean-info \
-       clean-libtool dist-info distclean distclean-generic \
-       distclean-libtool dvi dvi-am html html-am info info-am install \
-       install-am install-data install-data-am install-data-local \
-       install-exec install-exec-am install-info install-info-am \
-       install-man install-man1 install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
-       mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
-       pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-       uninstall-man uninstall-man1
-
-
-asconfig.texi: $(CONFIG).texi
-       rm -f asconfig.texi
-       ln -s $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-         || ln $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-         || cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
-
-gasver.texi: Makefile
-       rm -f $@
-       echo '@set VERSION $(VERSION)' > $@
-
-as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-
-# We want install to imply install-info as per GNU standards, despite the
-# cygnus option.
-install-data-local: install-info
-
-# Maintenance
-
-# We need it for the taz target in ../../Makefile.in.
-info: $(MANS)
-
-# Build the man page from the texinfo file
-# The sed command removes the no-adjust Nroff command so that
-# the man output looks standard.
-as.1: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-       touch $@
-       -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
-       -($(POD2MAN) as.pod | \
-               sed -e '/^.if n .na/d' > $@.T$$$$ && \
-               mv -f $@.T$$$$ $@) || \
-               (rm -f $@.T$$$$ && exit 1)
-       rm -f as.pod
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
index 56c9c8a..0c6a1b0 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
index 5bff607..652976b 100644 (file)
 .\" ========================================================================
 .\"
 .IX Title "AS 1"
-.TH AS 1 "2004-04-09" "binutils-2.14.91" "GNU Development Tools"
+.TH AS 1 "2004-05-07" "binutils-2.14.91" "GNU Development Tools"
 .SH "NAME"
 AS \- the portable GNU assembler.
 .SH "SYNOPSIS"
diff --git a/gas/po/Makefile b/gas/po/Makefile
deleted file mode 100644 (file)
index 52a65f1..0000000
+++ /dev/null
@@ -1,466 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# 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.
-
-PACKAGE = gas
-VERSION = 2.14.91
-
-SHELL = /bin/sh
-
-
-srcdir = .
-top_srcdir = ..
-
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-datadir = $(prefix)/share
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
-
-DESTDIR =
-
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-MKINSTALLDIRS = $(srcdir)/../../mkinstalldirs
-
-CC = gcc
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH /usr/bin/msgfmt
-MSGFMT = /usr/bin/msgfmt
-XGETTEXT = PATH=../src:$$PATH /usr/bin/xgettext
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = -DHAVE_CONFIG_H
-CFLAGS = -g -O2
-CPPFLAGS = 
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
-POFILES =  fr.po tr.po es.po
-GMOFILES =  fr.gmo tr.gmo es.gmo
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-       ../app.c \
-       ../app.c \
-       ../as.c \
-       ../as.c \
-       ../as.h \
-       ../asintl.h \
-       ../atof-generic.c \
-       ../atof-generic.c \
-       ../bignum-copy.c \
-       ../bignum-copy.c \
-       ../bignum.h \
-       ../bit_fix.h \
-       ../cgen.h \
-       ../cond.c \
-       ../cond.c \
-       ../config/e-crisaout.c \
-       ../config/e-criself.c \
-       ../config/e-i386aout.c \
-       ../config/e-i386coff.c \
-       ../config/e-i386elf.c \
-       ../config/e-mipsecoff.c \
-       ../config/e-mipself.c \
-       ../config/obj-aout.c \
-       ../config/obj-aout.h \
-       ../config/obj-bout.c \
-       ../config/obj-bout.h \
-       ../config/obj-coff.c \
-       ../config/obj-coff.h \
-       ../config/obj-ecoff.c \
-       ../config/obj-ecoff.h \
-       ../config/obj-elf.c \
-       ../config/obj-elf.h \
-       ../config/obj-evax.c \
-       ../config/obj-evax.h \
-       ../config/obj-hp300.c \
-       ../config/obj-hp300.h \
-       ../config/obj-ieee.c \
-       ../config/obj-ieee.h \
-       ../config/obj-som.c \
-       ../config/obj-som.h \
-       ../config/obj-vms.c \
-       ../config/obj-vms.h \
-       ../config/tc-a29k.c \
-       ../config/tc-a29k.h \
-       ../config/tc-alpha.c \
-       ../config/tc-alpha.h \
-       ../config/tc-arc.c \
-       ../config/tc-arc.h \
-       ../config/tc-arm.c \
-       ../config/tc-arm.h \
-       ../config/tc-avr.c \
-       ../config/tc-avr.h \
-       ../config/tc-cris.c \
-       ../config/tc-cris.h \
-       ../config/tc-d10v.c \
-       ../config/tc-d10v.h \
-       ../config/tc-d30v.c \
-       ../config/tc-d30v.h \
-       ../config/tc-dlx.c \
-       ../config/tc-dlx.h \
-       ../config/tc-fr30.c \
-       ../config/tc-fr30.h \
-       ../config/tc-frv.c \
-       ../config/tc-frv.h \
-       ../config/tc-h8300.c \
-       ../config/tc-h8300.h \
-       ../config/tc-h8500.c \
-       ../config/tc-h8500.h \
-       ../config/tc-hppa.c \
-       ../config/tc-hppa.h \
-       ../config/tc-i370.c \
-       ../config/tc-i370.h \
-       ../config/tc-i386.c \
-       ../config/tc-i386.h \
-       ../config/tc-i860.c \
-       ../config/tc-i860.h \
-       ../config/tc-i960.c \
-       ../config/tc-i960.h \
-       ../config/tc-ia64.c \
-       ../config/tc-ia64.h \
-       ../config/tc-ip2k.c \
-       ../config/tc-ip2k.h \
-       ../config/tc-m32r.c \
-       ../config/tc-m32r.h \
-       ../config/tc-m68hc11.c \
-       ../config/tc-m68hc11.h \
-       ../config/tc-m68k.c \
-       ../config/tc-m68k.h \
-       ../config/tc-m88k.c \
-       ../config/tc-m88k.h \
-       ../config/tc-mcore.c \
-       ../config/tc-mcore.h \
-       ../config/tc-mips.c \
-       ../config/tc-mips.h \
-       ../config/tc-mmix.c \
-       ../config/tc-mmix.h \
-       ../config/tc-mn10200.c \
-       ../config/tc-mn10200.h \
-       ../config/tc-mn10300.c \
-       ../config/tc-mn10300.h \
-       ../config/tc-msp430.c \
-       ../config/tc-msp430.h \
-       ../config/tc-ns32k.c \
-       ../config/tc-ns32k.h \
-       ../config/tc-openrisc.c \
-       ../config/tc-openrisc.h \
-       ../config/tc-or32.c \
-       ../config/tc-or32.h \
-       ../config/tc-pdp11.c \
-       ../config/tc-pdp11.h \
-       ../config/tc-pj.c \
-       ../config/tc-pj.h \
-       ../config/tc-ppc.c \
-       ../config/tc-ppc.h \
-       ../config/tc-s390.c \
-       ../config/tc-s390.h \
-       ../config/tc-sh64.c \
-       ../config/tc-sh64.h \
-       ../config/tc-sh.c \
-       ../config/tc-sh.h \
-       ../config/tc-sparc.c \
-       ../config/tc-sparc.h \
-       ../config/tc-tahoe.c \
-       ../config/tc-tahoe.h \
-       ../config/tc-tic30.c \
-       ../config/tc-tic30.h \
-       ../config/tc-tic54x.c \
-       ../config/tc-tic54x.h \
-       ../config/tc-tic80.c \
-       ../config/tc-tic80.h \
-       ../config/tc-v850.c \
-       ../config/tc-v850.h \
-       ../config/tc-vax.c \
-       ../config/tc-vax.h \
-       ../config/tc-w65.c \
-       ../config/tc-w65.h \
-       ../config/tc-xstormy16.c \
-       ../config/tc-xstormy16.h \
-       ../config/tc-xtensa.c \
-       ../config/tc-xtensa.h \
-       ../config/tc-z8k.c \
-       ../config/tc-z8k.h \
-       ../depend.c \
-       ../depend.c \
-       ../dw2gencfi.c \
-       ../dw2gencfi.c \
-       ../dw2gencfi.h \
-       ../dwarf2dbg.c \
-       ../dwarf2dbg.c \
-       ../dwarf2dbg.h \
-       ../ecoff.c \
-       ../ecoff.c \
-       ../ecoff.h \
-       ../ehopt.c \
-       ../ehopt.c \
-       ../emul.h \
-       ../emul-target.h \
-       ../expr.c \
-       ../expr.c \
-       ../expr.h \
-       ../flonum-copy.c \
-       ../flonum-copy.c \
-       ../flonum.h \
-       ../flonum-konst.c \
-       ../flonum-konst.c \
-       ../flonum-mult.c \
-       ../flonum-mult.c \
-       ../frags.c \
-       ../frags.c \
-       ../frags.h \
-       ../hash.c \
-       ../hash.c \
-       ../hash.h \
-       ../input-file.c \
-       ../input-file.c \
-       ../input-file.h \
-       ../input-scrub.c \
-       ../input-scrub.c \
-       ../itbl-ops.c \
-       ../itbl-ops.h \
-       ../listing.c \
-       ../listing.c \
-       ../listing.h \
-       ../literal.c \
-       ../literal.c \
-       ../macro.c \
-       ../macro.c \
-       ../macro.h \
-       ../messages.c \
-       ../messages.c \
-       ../obj.h \
-       ../output-file.c \
-       ../output-file.c \
-       ../output-file.h \
-       ../read.c \
-       ../read.c \
-       ../read.h \
-       ../sb.c \
-       ../sb.c \
-       ../sb.h \
-       ../stabs.c \
-       ../stabs.c \
-       ../struc-symbol.h \
-       ../subsegs.c \
-       ../subsegs.c \
-       ../subsegs.h \
-       ../symbols.c \
-       ../symbols.c \
-       ../symbols.h \
-       ../tc.h \
-       ../write.c \
-       ../write.c \
-       ../write.h
-
-CATALOGS =  fr.gmo tr.gmo es.gmo
-CATOBJEXT = .gmo
-INSTOBJEXT = .mo
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-       $(COMPILE) $<
-
-.po.pox:
-       $(MAKE) $(PACKAGE).pot
-       $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
-
-.po.mo:
-       $(MSGFMT) -o $@ $<
-
-.po.gmo:
-       file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-         && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-       sed -f ../intl/po2msg.sed < $< > $*.msg \
-         && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-yes
-
-all-yes: $(CATALOGS) # $(PACKAGE).pot
-all-no:
-
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
-       $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-         --add-comments --keyword=_ --keyword=N_ \
-         --files-from=$(srcdir)/POTFILES.in
-       rm -f $(srcdir)/$(PACKAGE).pot
-       mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-       rm -f cat-id-tbl.tmp
-       sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-               | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-       if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-         rm cat-id-tbl.tmp; \
-       else \
-         echo cat-id-tbl.c changed; \
-         rm -f $(srcdir)/cat-id-tbl.c; \
-         mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-       fi
-       cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-
-install: install-exec install-data
-install-exec:
-install-info:
-install-data: install-data-yes
-install-data-no: all
-install-data-yes: all
-       if test -r $(MKINSTALLDIRS); then \
-         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-       else \
-         $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-       fi
-       @catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         case "$$cat" in \
-           *.gmo) destdir=$(gnulocaledir);; \
-           *)     destdir=$(localedir);; \
-         esac; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-         if test -r $(MKINSTALLDIRS); then \
-           $(MKINSTALLDIRS) $$dir; \
-         else \
-           $(top_srcdir)/mkinstalldirs $$dir; \
-         fi; \
-         if test -r $$cat; then \
-           $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-           echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-         else \
-           $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-           echo "installing $(srcdir)/$$cat as" \
-                "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-         fi; \
-         if test -r $$cat.m; then \
-           $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-           echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-         else \
-           if test -r $(srcdir)/$$cat.m ; then \
-             $(INSTALL_DATA) $(srcdir)/$$cat.m \
-               $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-             echo "installing $(srcdir)/$$cat as" \
-                  "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-           else \
-             true; \
-           fi; \
-         fi; \
-       done
-       if test "$(PACKAGE)" = "gettext"; then \
-         if test -r $(MKINSTALLDIRS); then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-         else \
-           $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-         fi; \
-         $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-                         $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-       else \
-         : ; \
-       fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-       catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-       done
-       rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
-
-check: all
-
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-       rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-       rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-       rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
-       rm -f $(GMOFILES)
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
-       dists="$(DISTFILES)"; \
-       for file in $$dists; do \
-         ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-           || cp -p $(srcdir)/$$file $(distdir); \
-       done
-
-update-po: Makefile
-       $(MAKE) $(PACKAGE).pot
-       PATH=`pwd`/../src:$$PATH; \
-       cd $(srcdir); \
-       catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         mv $$lang.po $$lang.old.po; \
-         echo "$$lang:"; \
-         if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-           rm -f $$lang.old.po; \
-         else \
-           echo "msgmerge for $$cat failed!"; \
-           rm -f $$lang.po; \
-           mv $$lang.old.po $$lang.po; \
-         fi; \
-       done
-
-POTFILES: POTFILES.in
-       ( if test 'x$(srcdir)' != 'x.'; then \
-           posrcprefix='$(top_srcdir)/'; \
-         else \
-           posrcprefix="../"; \
-         fi; \
-         rm -f $@-t $@ \
-           && (sed -e '/^#/d' -e '/^[  ]*$$/d' \
-                   -e "s@.*@   $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-               | sed -e '$$s/\\$$//') > $@-t \
-           && chmod a-w $@-t \
-           && mv $@-t $@ )
-
-POTFILES.in: # ../Makefile
-       cd .. && $(MAKE) po/POTFILES.in
-
-Makefile: Make-in ../config.status POTFILES
-       cd .. \
-         && CONFIG_FILES=$(subdir)/Makefile.in:$(subdir)/Make-in \
-            CONFIG_HEADERS= $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/gas/po/POTFILES b/gas/po/POTFILES
deleted file mode 100644 (file)
index 142586d..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-       ../app.c \
-       ../app.c \
-       ../as.c \
-       ../as.c \
-       ../as.h \
-       ../asintl.h \
-       ../atof-generic.c \
-       ../atof-generic.c \
-       ../bignum-copy.c \
-       ../bignum-copy.c \
-       ../bignum.h \
-       ../bit_fix.h \
-       ../cgen.h \
-       ../cond.c \
-       ../cond.c \
-       ../config/e-crisaout.c \
-       ../config/e-criself.c \
-       ../config/e-i386aout.c \
-       ../config/e-i386coff.c \
-       ../config/e-i386elf.c \
-       ../config/e-mipsecoff.c \
-       ../config/e-mipself.c \
-       ../config/obj-aout.c \
-       ../config/obj-aout.h \
-       ../config/obj-bout.c \
-       ../config/obj-bout.h \
-       ../config/obj-coff.c \
-       ../config/obj-coff.h \
-       ../config/obj-ecoff.c \
-       ../config/obj-ecoff.h \
-       ../config/obj-elf.c \
-       ../config/obj-elf.h \
-       ../config/obj-evax.c \
-       ../config/obj-evax.h \
-       ../config/obj-hp300.c \
-       ../config/obj-hp300.h \
-       ../config/obj-ieee.c \
-       ../config/obj-ieee.h \
-       ../config/obj-som.c \
-       ../config/obj-som.h \
-       ../config/obj-vms.c \
-       ../config/obj-vms.h \
-       ../config/tc-a29k.c \
-       ../config/tc-a29k.h \
-       ../config/tc-alpha.c \
-       ../config/tc-alpha.h \
-       ../config/tc-arc.c \
-       ../config/tc-arc.h \
-       ../config/tc-arm.c \
-       ../config/tc-arm.h \
-       ../config/tc-avr.c \
-       ../config/tc-avr.h \
-       ../config/tc-cris.c \
-       ../config/tc-cris.h \
-       ../config/tc-d10v.c \
-       ../config/tc-d10v.h \
-       ../config/tc-d30v.c \
-       ../config/tc-d30v.h \
-       ../config/tc-dlx.c \
-       ../config/tc-dlx.h \
-       ../config/tc-fr30.c \
-       ../config/tc-fr30.h \
-       ../config/tc-frv.c \
-       ../config/tc-frv.h \
-       ../config/tc-h8300.c \
-       ../config/tc-h8300.h \
-       ../config/tc-h8500.c \
-       ../config/tc-h8500.h \
-       ../config/tc-hppa.c \
-       ../config/tc-hppa.h \
-       ../config/tc-i370.c \
-       ../config/tc-i370.h \
-       ../config/tc-i386.c \
-       ../config/tc-i386.h \
-       ../config/tc-i860.c \
-       ../config/tc-i860.h \
-       ../config/tc-i960.c \
-       ../config/tc-i960.h \
-       ../config/tc-ia64.c \
-       ../config/tc-ia64.h \
-       ../config/tc-ip2k.c \
-       ../config/tc-ip2k.h \
-       ../config/tc-m32r.c \
-       ../config/tc-m32r.h \
-       ../config/tc-m68hc11.c \
-       ../config/tc-m68hc11.h \
-       ../config/tc-m68k.c \
-       ../config/tc-m68k.h \
-       ../config/tc-m88k.c \
-       ../config/tc-m88k.h \
-       ../config/tc-mcore.c \
-       ../config/tc-mcore.h \
-       ../config/tc-mips.c \
-       ../config/tc-mips.h \
-       ../config/tc-mmix.c \
-       ../config/tc-mmix.h \
-       ../config/tc-mn10200.c \
-       ../config/tc-mn10200.h \
-       ../config/tc-mn10300.c \
-       ../config/tc-mn10300.h \
-       ../config/tc-msp430.c \
-       ../config/tc-msp430.h \
-       ../config/tc-ns32k.c \
-       ../config/tc-ns32k.h \
-       ../config/tc-openrisc.c \
-       ../config/tc-openrisc.h \
-       ../config/tc-or32.c \
-       ../config/tc-or32.h \
-       ../config/tc-pdp11.c \
-       ../config/tc-pdp11.h \
-       ../config/tc-pj.c \
-       ../config/tc-pj.h \
-       ../config/tc-ppc.c \
-       ../config/tc-ppc.h \
-       ../config/tc-s390.c \
-       ../config/tc-s390.h \
-       ../config/tc-sh64.c \
-       ../config/tc-sh64.h \
-       ../config/tc-sh.c \
-       ../config/tc-sh.h \
-       ../config/tc-sparc.c \
-       ../config/tc-sparc.h \
-       ../config/tc-tahoe.c \
-       ../config/tc-tahoe.h \
-       ../config/tc-tic30.c \
-       ../config/tc-tic30.h \
-       ../config/tc-tic54x.c \
-       ../config/tc-tic54x.h \
-       ../config/tc-tic80.c \
-       ../config/tc-tic80.h \
-       ../config/tc-v850.c \
-       ../config/tc-v850.h \
-       ../config/tc-vax.c \
-       ../config/tc-vax.h \
-       ../config/tc-w65.c \
-       ../config/tc-w65.h \
-       ../config/tc-xstormy16.c \
-       ../config/tc-xstormy16.h \
-       ../config/tc-xtensa.c \
-       ../config/tc-xtensa.h \
-       ../config/tc-z8k.c \
-       ../config/tc-z8k.h \
-       ../depend.c \
-       ../depend.c \
-       ../dw2gencfi.c \
-       ../dw2gencfi.c \
-       ../dw2gencfi.h \
-       ../dwarf2dbg.c \
-       ../dwarf2dbg.c \
-       ../dwarf2dbg.h \
-       ../ecoff.c \
-       ../ecoff.c \
-       ../ecoff.h \
-       ../ehopt.c \
-       ../ehopt.c \
-       ../emul.h \
-       ../emul-target.h \
-       ../expr.c \
-       ../expr.c \
-       ../expr.h \
-       ../flonum-copy.c \
-       ../flonum-copy.c \
-       ../flonum.h \
-       ../flonum-konst.c \
-       ../flonum-konst.c \
-       ../flonum-mult.c \
-       ../flonum-mult.c \
-       ../frags.c \
-       ../frags.c \
-       ../frags.h \
-       ../hash.c \
-       ../hash.c \
-       ../hash.h \
-       ../input-file.c \
-       ../input-file.c \
-       ../input-file.h \
-       ../input-scrub.c \
-       ../input-scrub.c \
-       ../itbl-ops.c \
-       ../itbl-ops.h \
-       ../listing.c \
-       ../listing.c \
-       ../listing.h \
-       ../literal.c \
-       ../literal.c \
-       ../macro.c \
-       ../macro.c \
-       ../macro.h \
-       ../messages.c \
-       ../messages.c \
-       ../obj.h \
-       ../output-file.c \
-       ../output-file.c \
-       ../output-file.h \
-       ../read.c \
-       ../read.c \
-       ../read.h \
-       ../sb.c \
-       ../sb.c \
-       ../sb.h \
-       ../stabs.c \
-       ../stabs.c \
-       ../struc-symbol.h \
-       ../subsegs.c \
-       ../subsegs.c \
-       ../subsegs.h \
-       ../symbols.c \
-       ../symbols.c \
-       ../symbols.h \
-       ../tc.h \
-       ../write.c \
-       ../write.c \
-       ../write.h
index 82d8c49..dfdf083 100644 (file)
@@ -1,3 +1,12 @@
+2004-05-06  Daniel Jacobowitz  <dan@debian.org>
+
+       Merge from mainline:
+       2004-04-23  Nick Clifton  <nickc@redhat.com>
+       * gas/symver/symver1.d: Cope with extra symbols inserted by
+       arm-elf toolchains.
+       * gas/symver/symver0.d: Likewise
+       * gas/elf/symver.d: Likewise.
+
 2004-05-05  Alexandre Oliva  <aoliva@redhat.com>
 
        * gas/frv/reloc1.d: Match elf32-frvfdpic as well.
index 67b8a4c..78bb618 100644 (file)
@@ -3,6 +3,7 @@
 #
 # The #... and #pass are there to match extra symbols inserted by
 # some toolchains, eg the mips-elf port will add .reginfo and .ptrd
+# and the arm-elf toolchain will add $d.
 
 dump.o:     file format .*
 
@@ -13,5 +14,6 @@ SYMBOL TABLE:
 0+000 l.*d.*\.bss.*0+000.*
 #...
 0+000 l.*O.*\.data.*0+004 x
+#...
 0+000 l.*O.*\.data.*0+004 x@VERS\.0
 #pass
index d318a30..9ad6c88 100644 (file)
@@ -1,6 +1,10 @@
 #nm: -n
 #name: symver symver0
+#
+# The #... and #pass are there to match extra symbols inserted by
+# some toolchains, eg arm-elf toolchain will add $d.
 
 [      ]+U foo@version1
+#...
 0+0000000 D foo1
 0+00000.. d L_foo1
index e1d80ea..ab9b949 100644 (file)
@@ -1,7 +1,11 @@
 #nm: -n
 #name: symver symver1
+#
+# The #... and #pass are there to match extra symbols inserted by
+# some toolchains, eg arm-elf toolchain will add $d.
 
 [      ]+U foo@version1
+#...
 0+0000000 D foo1@@version1
 0+00000.. d L_foo1
 0+00000.. D foo2
diff --git a/ld/ld.1 b/ld/ld.1
index 257dee8..1a75a36 100644 (file)
--- a/ld/ld.1
+++ b/ld/ld.1
 .\" ========================================================================
 .\"
 .IX Title "LD 1"
-.TH LD 1 "2004-04-09" "binutils-2.14.91" "GNU Development Tools"
+.TH LD 1 "2004-05-07" "binutils-2.14.91" "GNU Development Tools"
 .SH "NAME"
 ld \- Using LD, the GNU linker
 .SH "SYNOPSIS"
index a3292f2..8d85797 100644 (file)
@@ -1,3 +1,8 @@
+2004-05-05  Alan Modra  <amodra@bigpond.net.au>
+
+       PR 146.
+       * ppc-opc.c (PPCVEC): Remove PPC_OPCODE_PPC.
+
 2004-04-09  Daniel Jacobowitz  <drow@mvista.com>
 
        Merge from mainline:
index 36fe454..2d0dee5 100644 (file)
@@ -1764,7 +1764,7 @@ extract_tbr (unsigned long insn,
 #define PPC440 PPC_OPCODE_440
 #define PPC750 PPC
 #define PPC860 PPC
-#define PPCVEC PPC_OPCODE_ALTIVEC | PPC_OPCODE_PPC
+#define PPCVEC PPC_OPCODE_ALTIVEC
 #define        POWER   PPC_OPCODE_POWER
 #define        POWER2  PPC_OPCODE_POWER | PPC_OPCODE_POWER2
 #define PPCPWR2        PPC_OPCODE_PPC | PPC_OPCODE_POWER | PPC_OPCODE_POWER2