merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ef48f8609bcd892208d5e4bd583b9129fa5ee8f0..192ba30055a808102e4fb5613a73ad997ad9931b 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-28  Mark Shinwell  <shinwell@codesourcery.com>
+
+       * mkstemps.c: Open temporary files in binary mode.
+
 2006-05-12  Anton Blanchard  <anton@samba.org>
 
        * cplus-dem.c (demangle_fund_type): Ensure buf is large enough to

diff --git a/libiberty/mkstemps.c b/libiberty/mkstemps.c
index 89b37d9f4805a4d1822f740603b86bf08c0a02bc..6c2e472528babdfd1da3d18afff2e7ba1beb0a2e 100644 (file)
--- a/libiberty/mkstemps.c
+++ b/libiberty/mkstemps.c
@@ -49,6 +49,10 @@ typedef unsigned long gcc_uint64_t;
 #define TMP_MAX 16384
 #endif
 
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
 /*
 
 @deftypefn Replacement int mkstemps (char *@var{pattern}, int @var{suffix_len})
@@ -119,7 +123,7 @@ mkstemps (char *pattern, int suffix_len)
       v /= 62;
       XXXXXX[5] = letters[v % 62];
 
-      fd = open (pattern, O_RDWR|O_CREAT|O_EXCL, 0600);
+      fd = open (pattern, O_BINARY|O_RDWR|O_CREAT|O_EXCL, 0600);
       if (fd >= 0)
        /* The file does not exist.  */
        return fd;