merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 506cb8b..0705a14 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -68,19 +68,19 @@
 
 2006-03-29  Jim Blandy  <jimb@codesourcery.com>
 
-       * pex-common.c (pex_input_file, pex_input_pipe): New functions.
+       * pex-common.c (pex_input_file, pex_input_pipe): New functions.
        (pex_init_common): Initialize obj->input_file.
        (pex_run): Close any file opened by pex_input_file.
-       * pexecute.txh (pex_input_file, pex_input_pipe): New docs.
-       * pex-common.h (struct pex_obj): New field input_file.
+       * pexecute.txh (pex_input_file, pex_input_pipe): New docs.
+       * pex-common.h (struct pex_obj): New field input_file.
        (struct pex_funcs): New function ptr fdopenw.
-       * pex-unix.c (pex_unix_fdopenw): New function.
-       (funcs): List it as our fdopenw function.
-       * pex-win32.c (pex_win32_fdopenw): New function.
-       (funcs): List it as our fdopenw function.
-       * pex-djgpp.c (funcs): Leave fdopenw null.
-       * pex-msdos (funcs): Same.
-       * functions.texi: Regenerated.
+       * pex-unix.c (pex_unix_fdopenw): New function.
+       (funcs): List it as our fdopenw function.
+       * pex-win32.c (pex_win32_fdopenw): New function.
+       (funcs): List it as our fdopenw function.
+       * pex-djgpp.c (funcs): Leave fdopenw null.
+       * pex-msdos (funcs): Same.
+       * functions.texi: Regenerated.
 
 2006-04-10  Jim Blandy  <jimb@codesourcery.com>
 
@@ -6803,7 +6803,7 @@ Wed Aug 19 14:40:34 1992  Ian Lance Taylor  (ian@cygnus.com)
 
 Mon Aug 10 17:33:40 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
-       * Makefile.in: clean up definition of CFILES, more comments
+       * Makefile.in: clean up definition of CFILES, more comments
 
 Sat Aug  8 23:10:59 1992  Fred Fish  (fnf@cygnus.com)