merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index edda156e84391937f62af4dbd61b2ceb29127207..95cc22262ca18dea5e657c1c27c2c6aded818cc4 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-17  Ian Lance Taylor  <ian@wasabisystems.com>
+
+       * Makefile.in: Clean up REQUIRED_OFILES and CONFIGURED_OFILES for
+       an 80 column screen.  Run maint-deps.
+
 2004-03-09  Kelley Cook  <kcook@gcc.gnu.org>
 
        * configure.ac: Bump version to 2.59.  Apply suggested autoupdates.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index bbb5c2a7929b69b6a7e12b76a42291c3694f75e9..78cc4bca864daee537f2c5854a41b7cd38e981ba 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -157,44 +157,46 @@ CFILES = alloca.c argv.c asprintf.c atexit.c                              \
 
 # These are always included in the library.  The first four are listed
 # first and by compile time to optimize parallel builds.
-REQUIRED_OFILES = ./regex.o ./cplus-dem.o ./cp-demangle.o ./cp-demint.o ./md5.o                \
-       ./alloca.o ./argv.o                                                     \
-       ./choose-temp.o ./concat.o                                              \
+REQUIRED_OFILES = ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o      \
+       ./alloca.o ./argv.o                                             \
+       ./choose-temp.o ./concat.o ./cp-demint.o                        \
        ./dyn-string.o                                                  \
-       ./fdmatch.o ./fibheap.o ./floatformat.o ./fnmatch.o                     \
-       ./getopt.o ./getopt1.o ./getpwd.o ./getruntime.o                        \
-       ./hashtab.o ./hex.o                                                     \
-       ./lbasename.o                                                   \
-       ./lrealpath.o                                                   \
-       ./make-relative-prefix.o                                                \
-       ./make-temp-file.o                                              \
-       ./objalloc.o ./obstack.o                                                \
-       ./partition.o ./physmem.o @pexecute@                                            \
-       ./safe-ctype.o ./sort.o ./spaces.o ./splay-tree.o ./strerror.o          \
+       ./fdmatch.o ./fibheap.o ./floatformat.o ./fnmatch.o             \
+       ./getopt.o ./getopt1.o ./getpwd.o ./getruntime.o                \
+       ./hashtab.o ./hex.o                                             \
+       ./lbasename.o ./lrealpath.o                                     \
+       ./make-relative-prefix.o ./make-temp-file.o                     \
+       ./objalloc.o ./obstack.o                                        \
+       ./partition.o ./physmem.o @pexecute@                            \
+       ./safe-ctype.o ./sort.o ./spaces.o ./splay-tree.o ./strerror.o  \
         ./strsignal.o                                                  \
        ./ternary.o                                                     \
-       ./xatexit.o ./xexit.o ./xmalloc.o ./xmemdup.o ./xstrdup.o ./xstrerror.o
+       ./xatexit.o ./xexit.o ./xmalloc.o ./xmemdup.o ./xstrdup.o       \
+        ./xstrerror.o
 
 # These are all the objects that configure may add to the library via
 # $funcs or EXTRA_OFILES.  This list exists here only for "make
 # maint-missing" and "make check".
-CONFIGURED_OFILES = ./asprintf.o ./atexit.o                                    \
-       ./basename.o ./bcmp.o ./bcopy.o ./bsearch.o ./bzero.o                   \
-       ./calloc.o ./clock.o ./copysign.o                                       \
+CONFIGURED_OFILES = ./asprintf.o ./atexit.o                            \
+       ./basename.o ./bcmp.o ./bcopy.o ./bsearch.o ./bzero.o           \
+       ./calloc.o ./clock.o ./copysign.o                               \
        ./_doprnt.o                                                     \
        ./ffs.o                                                         \
-       ./getcwd.o ./getpagesize.o                                              \
+       ./getcwd.o ./getpagesize.o                                      \
        ./index.o ./insque.o                                            \
-       ./memchr.o ./memcmp.o ./memcpy.o ./memmove.o ./mempcpy.o ./memset.o ./mkstemps.o \
-       ./pex-djgpp.o ./pex-mpw.o ./pex-msdos.o ./pex-os2.o                     \
-        ./pex-unix.o ./pex-win32.o                                             \
+       ./memchr.o ./memcmp.o ./memcpy.o ./memmove.o ./mempcpy.o        \
+        ./memset.o ./mkstemps.o                                        \
+       ./pex-djgpp.o ./pex-mpw.o ./pex-msdos.o ./pex-os2.o             \
+        ./pex-unix.o ./pex-win32.o                                     \
         ./putenv.o                                                     \
-       ./random.o ./rename.o ./rindex.o                                        \
-       ./setenv.o ./sigsetmask.o ./snprintf.o ./stpcpy.o ./stpncpy.o ./strcasecmp.o \
-        ./strchr.o ./strdup.o ./strncasecmp.o ./strncmp.o ./strrchr.o ./strstr.o       \
-        ./strtod.o ./strtol.o ./strtoul.o                                      \
+       ./random.o ./rename.o ./rindex.o                                \
+       ./setenv.o ./sigsetmask.o ./snprintf.o ./stpcpy.o ./stpncpy.o   \
+        ./strcasecmp.o ./strchr.o ./strdup.o ./strncasecmp.o           \
+        ./strncmp.o ./strrchr.o ./strstr.o                             \
+        ./strtod.o ./strtol.o ./strtoul.o                              \
        ./tmpnam.o                                                      \
-       ./vasprintf.o ./vfork.o ./vfprintf.o ./vprintf.o ./vsnprintf.o ./vsprintf.o     \
+       ./vasprintf.o ./vfork.o ./vfprintf.o ./vprintf.o ./vsnprintf.o  \
+        ./vsprintf.o                                                   \
        ./waitpid.o
 
 # These files are installed if the library has been configured to do so.
@@ -807,7 +809,8 @@ $(CONFIGURED_OFILES): stamp-picdir
        else true; fi
        $(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION)
 
-./regex.o: $(srcdir)/regex.c config.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
+./regex.o: $(srcdir)/regex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
+       $(INCDIR)/xregex2.h
        if [ x"$(PICFLAG)" != x ]; then \
          $(COMPILE.c) $(PICFLAG) $(srcdir)/regex.c -o pic/$@; \
        else true; fi