From 4cef8a9f87d907d5d188b64178b8f875ca1b03fa Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 25 Aug 2008 04:38:13 +0000
Subject: [PATCH] 	* sysdep.h: Include "binary-io.h". 	(O_BINARY):
 Don't define here. 	* bin2c.c (O_BINARY, O_TEXT, SET_BINARY): Don't define
 here. 	* strings.c: Likewise. 	(main): Remove #ifdef SET_BINARY. 	*
 Makefile.am: Run "make dep-am" 	* Makefile.in: Regenerate.

---
 binutils/ChangeLog   |  10 +++
 binutils/Makefile.am | 205 +++++++++++++++++++++----------------------
 binutils/Makefile.in | 205 +++++++++++++++++++++----------------------
 binutils/bin2c.c     |  24 -----
 binutils/strings.c   |  14 ---
 binutils/sysdep.h    |  13 +--
 6 files changed, 216 insertions(+), 255 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 6e0bfb4551d..ff79e20e774 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* sysdep.h: Include "binary-io.h".
+	(O_BINARY): Don't define here.
+	* bin2c.c (O_BINARY, O_TEXT, SET_BINARY): Don't define here.
+	* strings.c: Likewise.
+	(main): Remove #ifdef SET_BINARY.
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
 2008-08-24  Alan Modra  <amodra@bigpond.net.au>
 
 	* configure.in: Update a number of obsolete autoconf macros.
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 3a1d19a1fa0..7bdc94b0da8 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -446,141 +446,138 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 addr2line.o: addr2line.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   bucomm.h
 ar.o: ar.c sysdep.h config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h \
-  $(INCDIR)/fopen-same.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/progress.h $(INCDIR)/aout/ar.h $(BFDDIR)/libbfd.h \
   $(INCDIR)/hashtab.h bucomm.h arsup.h $(INCDIR)/filenames.h \
   binemul.h
 arsup.o: arsup.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/filenames.h bucomm.h \
   arsup.h
 bin2c.o: bin2c.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 binemul.o: binemul.c binemul.h sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 bucomm.o: bucomm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/filenames.h $(BFDDIR)/libbfd.h \
   $(INCDIR)/hashtab.h bucomm.h
 coffdump.o: coffdump.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h coffgrok.h
 coffgrok.o: coffgrok.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
   $(INCDIR)/bfdlink.h bucomm.h coffgrok.h
 cxxfilt.o: cxxfilt.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   $(INCDIR)/safe-ctype.h bucomm.h
 dwarf.o: dwarf.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h bucomm.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/dwarf2.h dwarf.h
 debug.o: debug.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h debug.h
 dlltool.o: dlltool.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   $(INCDIR)/dyn-string.h bucomm.h dlltool.h $(INCDIR)/safe-ctype.h
 dllwrap.o: dllwrap.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/dyn-string.h bucomm.h
 emul_aix.o: emul_aix.c binemul.h sysdep.h config.h \
   $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   bucomm.h $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
-  $(BFDDIR)/libxcoff.h
+  $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(BFDDIR)/libxcoff.h
 emul_vanilla.o: emul_vanilla.c binemul.h sysdep.h config.h \
   $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   bucomm.h
 filemode.o: filemode.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 ieee.o: ieee.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/ieee.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h debug.h \
-  budbg.h $(INCDIR)/filenames.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/ieee.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/ansidecl.h debug.h budbg.h $(INCDIR)/filenames.h
 is-ranlib.o: is-ranlib.c
 is-strip.o: is-strip.c
 maybe-ranlib.o: maybe-ranlib.c
 maybe-strip.o: maybe-strip.c
 nlmconv.o: nlmconv.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(BFDDIR)/libnlm.h \
   $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \
   nlmconv.h bucomm.h
 nm.o: nm.c sysdep.h config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h \
-  $(INCDIR)/fopen-same.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h $(INCDIR)/progress.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/common.h \
-  bucomm.h
+  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h bucomm.h
 not-ranlib.o: not-ranlib.c
 not-strip.o: not-strip.c
 objcopy.o: objcopy.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/progress.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/progress.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h bucomm.h \
   budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h
 objdump.o: objdump.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(BFDDIR)/elf-bfd.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/progress.h bucomm.h dwarf.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/dis-asm.h ../bfd/bfd.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h \
-  $(INCDIR)/libiberty.h debug.h budbg.h $(INCDIR)/aout/aout64.h
+  $(INCDIR)/safe-ctype.h $(INCDIR)/dis-asm.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
+  debug.h budbg.h $(INCDIR)/aout/aout64.h
 prdbg.o: prdbg.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   debug.h budbg.h
 rclex.o: rclex.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h windres.h \
   winduni.h windint.h rcparse.h
 rdcoff.o: rdcoff.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h bucomm.h \
   debug.h budbg.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 rddbg.o: rddbg.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h debug.h budbg.h
-readelf.o: readelf.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h dwarf.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/h8.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/alpha.h \
+readelf.o: readelf.c config.h sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h dwarf.h $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/h8.h \
+  $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/alpha.h \
   $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h $(INCDIR)/elf/avr.h \
   $(INCDIR)/elf/bfin.h $(INCDIR)/elf/cr16.h $(INCDIR)/elf/cris.h \
   $(INCDIR)/elf/crx.h $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h \
@@ -599,108 +596,108 @@ readelf.o: readelf.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/xtensa.h $(INCDIR)/aout/ar.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h unwind-ia64.h
 rename.o: rename.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 resbin.o: resbin.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h
 rescoff.o: rescoff.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h \
   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 resrc.o: resrc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h windres.h \
   winduni.h windint.h
 resres.o: resres.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h
 size.o: size.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h
 srconv.o: srconv.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h sysroff.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h sysroff.h \
   coffgrok.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
   sysroff.c
 stabs.o: stabs.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(INCDIR)/demangle.h \
   $(INCDIR)/libiberty.h debug.h budbg.h $(INCDIR)/filenames.h \
   $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
 strings.o: strings.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h bucomm.h
 sysdump.o: sysdump.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/safe-ctype.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/safe-ctype.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h bucomm.h \
-  sysroff.h sysroff.c $(INCDIR)/ansidecl.h
+  sysroff.h sysroff.c
 unwind-ia64.o: unwind-ia64.c unwind-ia64.h $(INCDIR)/elf/ia64.h \
   $(INCDIR)/elf/reloc-macros.h $(INCDIR)/ansidecl.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+  $(INCDIR)/symcat.h
 version.o: version.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 windres.o: windres.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
   windres.h winduni.h windint.h
 winduni.o: winduni.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h winduni.h $(INCDIR)/safe-ctype.h
 wrstabs.o: wrstabs.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h bucomm.h \
   debug.h budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def
 windmc.o: windmc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
   windmc.h winduni.h windint.h
 mclex.o: mclex.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h windmc.h \
   winduni.h mcparse.h
 arparse.o: arparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h arsup.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h arsup.h
 arlex.o: arlex.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h arparse.h
 sysroff.o: sysroff.c
 sysinfo.o: sysinfo.c
 syslex.o: syslex.c config.h sysinfo.h
 defparse.o: defparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h dlltool.h
 deflex.o: deflex.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   defparse.h dlltool.h $(INCDIR)/ansidecl.h
 nlmheader.o: nlmheader.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h bucomm.h \
   nlmconv.h
 rcparse.o: rcparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h \
   $(INCDIR)/safe-ctype.h
 mcparse.o: mcparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windmc.h winduni.h $(INCDIR)/safe-ctype.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 63cfaec1600..74e20fccdb4 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1200,141 +1200,138 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 addr2line.o: addr2line.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   bucomm.h
 ar.o: ar.c sysdep.h config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h \
-  $(INCDIR)/fopen-same.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/progress.h $(INCDIR)/aout/ar.h $(BFDDIR)/libbfd.h \
   $(INCDIR)/hashtab.h bucomm.h arsup.h $(INCDIR)/filenames.h \
   binemul.h
 arsup.o: arsup.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/filenames.h bucomm.h \
   arsup.h
 bin2c.o: bin2c.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 binemul.o: binemul.c binemul.h sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 bucomm.o: bucomm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/filenames.h $(BFDDIR)/libbfd.h \
   $(INCDIR)/hashtab.h bucomm.h
 coffdump.o: coffdump.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h coffgrok.h
 coffgrok.o: coffgrok.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
   $(INCDIR)/bfdlink.h bucomm.h coffgrok.h
 cxxfilt.o: cxxfilt.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   $(INCDIR)/safe-ctype.h bucomm.h
 dwarf.o: dwarf.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h bucomm.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/dwarf2.h dwarf.h
 debug.o: debug.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h debug.h
 dlltool.o: dlltool.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   $(INCDIR)/dyn-string.h bucomm.h dlltool.h $(INCDIR)/safe-ctype.h
 dllwrap.o: dllwrap.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/dyn-string.h bucomm.h
 emul_aix.o: emul_aix.c binemul.h sysdep.h config.h \
   $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   bucomm.h $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
-  $(BFDDIR)/libxcoff.h
+  $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(BFDDIR)/libxcoff.h
 emul_vanilla.o: emul_vanilla.c binemul.h sysdep.h config.h \
   $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   bucomm.h
 filemode.o: filemode.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 ieee.o: ieee.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/ieee.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h debug.h \
-  budbg.h $(INCDIR)/filenames.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/ieee.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/ansidecl.h debug.h budbg.h $(INCDIR)/filenames.h
 is-ranlib.o: is-ranlib.c
 is-strip.o: is-strip.c
 maybe-ranlib.o: maybe-ranlib.c
 maybe-strip.o: maybe-strip.c
 nlmconv.o: nlmconv.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(BFDDIR)/libnlm.h \
   $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \
   nlmconv.h bucomm.h
 nm.o: nm.c sysdep.h config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h \
-  $(INCDIR)/fopen-same.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h $(INCDIR)/progress.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/common.h \
-  bucomm.h
+  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h bucomm.h
 not-ranlib.o: not-ranlib.c
 not-strip.o: not-strip.c
 objcopy.o: objcopy.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/progress.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/progress.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h bucomm.h \
   budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h
 objdump.o: objdump.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(BFDDIR)/elf-bfd.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/progress.h bucomm.h dwarf.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/dis-asm.h ../bfd/bfd.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h \
-  $(INCDIR)/libiberty.h debug.h budbg.h $(INCDIR)/aout/aout64.h
+  $(INCDIR)/safe-ctype.h $(INCDIR)/dis-asm.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
+  debug.h budbg.h $(INCDIR)/aout/aout64.h
 prdbg.o: prdbg.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
   debug.h budbg.h
 rclex.o: rclex.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h windres.h \
   winduni.h windint.h rcparse.h
 rdcoff.o: rdcoff.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h bucomm.h \
   debug.h budbg.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 rddbg.o: rddbg.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h debug.h budbg.h
-readelf.o: readelf.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h dwarf.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/h8.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/alpha.h \
+readelf.o: readelf.c config.h sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h dwarf.h $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/h8.h \
+  $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/alpha.h \
   $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h $(INCDIR)/elf/avr.h \
   $(INCDIR)/elf/bfin.h $(INCDIR)/elf/cr16.h $(INCDIR)/elf/cris.h \
   $(INCDIR)/elf/crx.h $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h \
@@ -1353,109 +1350,109 @@ readelf.o: readelf.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/xtensa.h $(INCDIR)/aout/ar.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h unwind-ia64.h
 rename.o: rename.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 resbin.o: resbin.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h
 rescoff.o: rescoff.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h \
   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 resrc.o: resrc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h windres.h \
   winduni.h windint.h
 resres.o: resres.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h
 size.o: size.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h
 srconv.o: srconv.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h sysroff.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h sysroff.h \
   coffgrok.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
   sysroff.c
 stabs.o: stabs.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(INCDIR)/demangle.h \
   $(INCDIR)/libiberty.h debug.h budbg.h $(INCDIR)/filenames.h \
   $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
 strings.o: strings.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h bucomm.h
 sysdump.o: sysdump.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/safe-ctype.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/safe-ctype.h \
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h bucomm.h \
-  sysroff.h sysroff.c $(INCDIR)/ansidecl.h
+  sysroff.h sysroff.c
 unwind-ia64.o: unwind-ia64.c unwind-ia64.h $(INCDIR)/elf/ia64.h \
   $(INCDIR)/elf/reloc-macros.h $(INCDIR)/ansidecl.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+  $(INCDIR)/symcat.h
 version.o: version.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h
 windres.o: windres.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
   windres.h winduni.h windint.h
 winduni.o: winduni.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h bucomm.h winduni.h $(INCDIR)/safe-ctype.h
 wrstabs.o: wrstabs.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h bucomm.h \
   debug.h budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def
 windmc.o: windmc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
   windmc.h winduni.h windint.h
 mclex.o: mclex.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h windmc.h \
   winduni.h mcparse.h
 arparse.o: arparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h arsup.h
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h arsup.h
 arlex.o: arlex.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h arparse.h
 sysroff.o: sysroff.c
 sysinfo.o: sysinfo.c
 syslex.o: syslex.c config.h sysinfo.h
 defparse.o: defparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h dlltool.h
 deflex.o: deflex.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   defparse.h dlltool.h $(INCDIR)/ansidecl.h
 nlmheader.o: nlmheader.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h bucomm.h \
   nlmconv.h
 rcparse.o: rcparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windres.h winduni.h windint.h \
   $(INCDIR)/safe-ctype.h
 mcparse.o: mcparse.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-  ../bfd/bfdver.h $(INCDIR)/fopen-same.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
+  ../bfd/bfdver.h $(INCDIR)/fopen-same.h $(INCDIR)/binary-io.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h windmc.h winduni.h $(INCDIR)/safe-ctype.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/binutils/bin2c.c b/binutils/bin2c.c
index b3138e1f741..a1f0ef51d44 100644
--- a/binutils/bin2c.c
+++ b/binutils/bin2c.c
@@ -22,30 +22,6 @@
 #include "bfd.h"
 #include "bucomm.h"
 
-#if !defined O_TEXT && defined _O_TEXT
-  /* For MSC-compatible compilers.  */
-# define O_TEXT _O_TEXT
-#endif
-
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-
-#if O_BINARY
-# ifndef __DJGPP__
-#  define setmode _setmode
-#  define fileno(_fp) _fileno (_fp)
-# endif /* not DJGPP */
-# define SET_BINARY(_f) \
-  do { if (!isatty (_f)) setmode (_f, O_BINARY); } while (0)
-#else
-# define SET_BINARY(f) (void) 0
-# define O_BINARY 0
-# define O_TEXT 0
-#endif /* O_BINARY */
-
 int
 main (int argc, char *argv[])
 {
diff --git a/binutils/strings.c b/binutils/strings.c
index 973045e17c9..8a0f01192c1 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -66,18 +66,6 @@
 #include <sys/stat.h>
 #include "bucomm.h"
 
-/* Some platforms need to put stdin into binary mode, to read
-    binary files.  */
-#ifdef HAVE_SETMODE
-#ifdef _O_BINARY
-#define setmode _setmode
-#endif
-#if O_BINARY
-#include <io.h>
-#define SET_BINARY(f) do { if (!isatty (f)) setmode (f, O_BINARY); } while (0)
-#endif
-#endif
-
 #define STRING_ISGRAPHIC(c) \
       (   (c) >= 0 \
        && (c) <= 255 \
@@ -286,9 +274,7 @@ main (int argc, char **argv)
   if (optind >= argc)
     {
       datasection_only = FALSE;
-#ifdef SET_BINARY
       SET_BINARY (fileno (stdin));
-#endif
       print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL);
       files_given = TRUE;
     }
diff --git a/binutils/sysdep.h b/binutils/sysdep.h
index e6a89a49d3c..18518dccdc6 100644
--- a/binutils/sysdep.h
+++ b/binutils/sysdep.h
@@ -1,6 +1,7 @@
 /* sysdep.h -- handle host dependencies for binutils
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -36,14 +37,6 @@
 #include "fopen-same.h"
 #endif
 
-#ifndef O_BINARY
-#ifdef  _O_BINARY
-#define O_BINARY _O_BINARY
-#else
-#define O_BINARY 0
-#endif
-#endif
-
 #include <errno.h>
 #ifndef errno
 extern int errno;
@@ -76,6 +69,8 @@ extern char *strrchr ();
 #endif
 #endif
 
+#include "binary-io.h"
+
 #if !HAVE_DECL_STPCPY
 extern char *stpcpy (char *, const char *);
 #endif
-- 
2.30.2