PR gas/2991

* acinclude.m4 (BFD_BINARY_FOPEN): Import this function from bfd/aclocal.m4.
* configure.in: Run BFD_BINARY_FOPEN.
* configure: Regenerate.
* as.h: Look at USE_BINARY_FOPEN to decide which fopen-*.h header file to include.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 368c9264486a44c07dbdb6f133ba9228acbe37aa..937a60f072b0ed7b7271e905d943b588909e5563 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-02  Nick Clifton  <nickc@redhat.com>
+
+       PR gas/2991
+       * acinclude.m4 (BFD_BINARY_FOPEN): Import this function from
+       bfd/aclocal.m4.
+       * configure.in: Run BFD_BINARY_FOPEN.
+       * configure: Regenerate.
+       * as.h: Look at USE_BINARY_FOPEN to decide which fopen-*.h header
+       file to include.
+
 2006-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (md_assemble): Don't update

diff --git a/gas/acinclude.m4 b/gas/acinclude.m4
index 7ba95d0fa9fa00a532e9ed2c5aefd1011ec790fb..096b0afe16e943eda7323777edc544499973feaf 100644 (file)
--- a/gas/acinclude.m4
+++ b/gas/acinclude.m4
@@ -4,6 +4,16 @@ sinclude(../config/nls.m4)
 sinclude(../config/po.m4)
 sinclude(../config/progtest.m4)
 
+dnl See whether we need to use fopen-bin.h rather than fopen-same.h.
+AC_DEFUN([BFD_BINARY_FOPEN],
+[AC_REQUIRE([AC_CANONICAL_TARGET])
+case "${host}" in
+changequote(,)dnl
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+changequote([,])dnl
+  AC_DEFINE(USE_BINARY_FOPEN, 1, [Use b modifier when opening binary files?]) ;;
+esac])dnl
+
 dnl GAS_CHECK_DECL_NEEDED(name, typedefname, typedef, headers)
 AC_DEFUN([GAS_CHECK_DECL_NEEDED],[
 AC_MSG_CHECKING(whether declaration is required for $1)

diff --git a/gas/as.h b/gas/as.h
index 2f92c2ed7748509850dee48840876c77cef9259f..424bd979d47820505e3329ef4126226cff4f9e84 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -210,7 +210,7 @@ extern int vsnprintf(char *, size_t, const char *, va_list);
 #endif /* __FILE__ */
 
 #ifndef FOPEN_WB
-#if defined GO32 || defined __MINGW32__
+#ifdef USE_BINARY_FOPEN
 #include "fopen-bin.h"
 #else
 #include "fopen-same.h"

diff --git a/gas/configure b/gas/configure
index 05851f4fe77b38e648dccd95756f43c4d3e550ef..166ae272b0a55dbe32450fb8c4335bf79cf711d4 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -6214,8 +6214,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if test -f  ../intl/config.intl; then
+  .  ../intl/config.intl
 fi
 echo "$as_me:$LINENO: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
@@ -8833,6 +8834,16 @@ fi
 
 
 
+case "${host}" in
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_BINARY_FOPEN 1
+_ACEOF
+ ;;
+esac
+
+
 
 
 

diff --git a/gas/configure.in b/gas/configure.in
index fa21e174f991fe5355da70e9a344b0418a5e0d00..c306516fe6a20173c39978301040d002852dc2de 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -660,6 +660,8 @@ GAS_CHECK_DECL_NEEDED(strstr, f, char *(*f)(), $gas_test_headers)
 
 AC_CHECK_DECLS([vsnprintf])
 
+BFD_BINARY_FOPEN
+
 dnl Required for html and install-html targets.
 AC_SUBST(datarootdir)
 AC_SUBST(docdir)